svn merge ^/branches/released .

38 files changed, 3783 insertions, 3088 deletions

diff --git a/X11/extensions/Makefile.in b/X11/extensions/Makefile.in
deleted file mode 100644
index 81eaffd2a..000000000
--- a/X11/extensions/Makefile.in
+++ /dev/null
@@ -1,856 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(compat_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/xextproto.pc.in $(top_srcdir)/configure \
-	$(xext_HEADERS) COPYING ChangeLog INSTALL config.guess \
-	config.sub install-sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = xextproto.pc
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(compatdir)" \
-	"$(DESTDIR)$(xextdir)"
-DATA = $(pkgconfig_DATA)
-HEADERS = $(compat_HEADERS) $(xext_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
-ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APP_MAN_DIR = @APP_MAN_DIR@
-APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHANGELOG_CMD = @CHANGELOG_CMD@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CWARNFLAGS = @CWARNFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
-DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FILE_MAN_DIR = @FILE_MAN_DIR@
-FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-FOP = @FOP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_CMD = @INSTALL_CMD@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIB_MAN_DIR = @LIB_MAN_DIR@
-LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MAN_SUBSTS = @MAN_SUBSTS@
-MISC_MAN_DIR = @MISC_MAN_DIR@
-MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
-VERSION = @VERSION@
-XMLTO = @XMLTO@
-XORG_MAN_PAGE = @XORG_MAN_PAGE@
-XORG_SGML_PATH = @XORG_SGML_PATH@
-XSL_STYLESHEET = @XSL_STYLESHEET@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = specs
-xextdir = $(includedir)/X11/extensions
-xext_HEADERS = \
-	dpmsconst.h \
-	dpmsproto.h \
-        ge.h \
-        geproto.h \
-	lbx.h \
-	lbxproto.h \
-	mitmiscconst.h \
-	mitmiscproto.h \
-	multibufconst.h \
-	multibufproto.h \
-	secur.h \
-	securproto.h \
-	shapeconst.h \
-	shapeproto.h \
-	shm.h \
-	shmproto.h \
-	syncconst.h \
-	syncproto.h \
-	ag.h \
-	agproto.h \
-	cup.h \
-	cupproto.h \
-	dbe.h \
-	dbeproto.h \
-	EVI.h \
-	EVIproto.h \
-	xtestext1proto.h \
-	xtestext1const.h \
-	xtestconst.h \
-	xtestproto.h
-
-
-#
-# These headers allow old servers to be built with
-# new headers
-#
-compatdir = $(xextdir)
-compat_HEADERS = \
-	shapestr.h \
-	shmstr.h \
-	syncstr.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xextproto.pc
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-xextproto.pc: $(top_builddir)/config.status $(srcdir)/xextproto.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
-install-compatHEADERS: $(compat_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(compatdir)" || $(MKDIR_P) "$(DESTDIR)$(compatdir)"
-	@list='$(compat_HEADERS)'; test -n "$(compatdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(compatdir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(compatdir)" || exit $$?; \
-	done
-
-uninstall-compatHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(compat_HEADERS)'; test -n "$(compatdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(compatdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(compatdir)" && rm -f $$files
-install-xextHEADERS: $(xext_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(xextdir)" || $(MKDIR_P) "$(DESTDIR)$(xextdir)"
-	@list='$(xext_HEADERS)'; test -n "$(xextdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(xextdir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(xextdir)" || exit $$?; \
-	done
-
-uninstall-xextHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(xext_HEADERS)'; test -n "$(xextdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(xextdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(xextdir)" && rm -f $$files
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA) $(HEADERS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(compatdir)" "$(DESTDIR)$(xextdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-compatHEADERS install-pkgconfigDATA \
-	install-xextHEADERS
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-compatHEADERS uninstall-pkgconfigDATA \
-	uninstall-xextHEADERS
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-compatHEADERS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
-	install-strip install-xextHEADERS installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-compatHEADERS uninstall-pkgconfigDATA \
-	uninstall-xextHEADERS
-
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/X11/extensions/configure.ac b/X11/extensions/configure.ac
index 92d49d9d7..a8ce7c171 100644
--- a/X11/extensions/configure.ac
+++ b/X11/extensions/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])

-AC_INIT([XExtProto], [7.1.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])

+AC_INIT([XExtProto], [7.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

 

diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml
index e5b96ab84..7b27d9f0c 100644
--- a/libX11/specs/i18n/localedb/localedb.xml
+++ b/libX11/specs/i18n/localedb/localedb.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

                    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

 

-<book id="localedbspec">

+<book id="localedb">

 

 <bookinfo>

    <title>X Locale Database Specification</title>

@@ -71,7 +71,7 @@ in this Software without prior written authorization from X Consortium.
 </legalnotice>

 </bookinfo>

 

-<chapter id="localedb">

+<chapter id="localeDatabase">

 <title>LocaleDB</title>

 

 <sect1 id="General">

diff --git a/libX11/specs/i18n/trans/trans.xml b/libX11/specs/i18n/trans/trans.xml
index 9a01d97f6..5018c9192 100644
--- a/libX11/specs/i18n/trans/trans.xml
+++ b/libX11/specs/i18n/trans/trans.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

                    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

 

-<book id="xtransportspec">

+<book id="trans">

 

 <bookinfo>

    <title>The XIM Transport Specification</title>

diff --git a/libXext/src/Xge.c b/libXext/src/Xge.c
index 724011eab..e029b42b9 100644
--- a/libXext/src/Xge.c
+++ b/libXext/src/Xge.c
@@ -292,7 +292,7 @@ _xgeEventToWire(Display* dpy, XEvent* re, xEvent* event)
  * Extensions need to register callbacks for their events.

  */

 Bool

-xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks)

+_X_HIDDEN xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks)

 {

     XGEExtNode* newExt;

     XGEData* xge_data;

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 81a67eaba..fc3c853d4 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -27,7 +27,7 @@ Non-normalized Integer texture/framebuffer formats    ~50% done
 1D/2D Texture arrays                                  core Mesa, swrast done

 Packed depth/stencil formats                          DONE

 Per-buffer blend and masks (GL_EXT_draw_buffers2)     DONE

-GL_EXT_texture_compression_rgtc                       not started

+GL_EXT_texture_compression_rgtc                       DONE (swrast, gallium r600)

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

 Transform feedback (GL_EXT_transform_feedback)        ~50% done

    glBindFragDataLocation, glGetFragDataLocation,

diff --git a/mesalib/docs/MESA_multithread_makecurrent.spec b/mesalib/docs/MESA_multithread_makecurrent.spec
new file mode 100644
index 000000000..5065c2fc0
--- /dev/null
+++ b/mesalib/docs/MESA_multithread_makecurrent.spec
@@ -0,0 +1,158 @@
+Name
+
+    MESA_multithread_makecurrent
+
+Name Strings
+
+    GLX_MESA_multithread_makecurrent
+
+Contact
+
+    Eric Anholt (eric@anholt.net)
+
+Status
+
+    Not shipping.
+
+Version
+
+    Last Modified Date:  21 February 2011
+
+Number
+
+    TBD
+
+Dependencies
+
+    OpenGL 1.0 or later is required.
+    GLX 1.3 or later is required.
+
+Overview
+
+    The GLX context setup encourages multithreaded applications to
+    create a context per thread which each operate on their own
+    objects in parallel, and leaves synchronization for write access
+    to shared objects up to the application.
+
+    For some applications, maintaining per-thread contexts and
+    ensuring that the glFlush happens in one thread before another
+    thread starts working on that object is difficult.  For them,
+    using the same context across multiple threads and protecting its
+    usage with a mutex is both higher performance and easier to
+    implement.  This extension gives those applications that option by
+    relaxing the context binding requirements.
+
+    This new behavior matches the requirements of AGL, while providing
+    a feature not specified in WGL.
+
+IP Status
+
+    Open-source; freely implementable.
+
+Issues
+
+    None.
+
+New Procedures and Functions
+
+    None.
+
+New Tokens
+
+    None.
+
+Changes to Chapter 2 of the GLX 1.3 Specification (Functions and Errors)
+
+    Replace the following sentence from section 2.2 Rendering Contexts:
+	In addition, a rendering context can be current for only one
+	thread at a time.
+    with:
+	In addition, an indirect rendering context can be current for
+	only one thread at a time.  A direct rendering context may be
+	current to multiple threads, with synchronization of access to
+	the context thruogh the GL managed by the application through
+	mutexes.
+
+Changes to Chapter 3 of the GLX 1.3 Specification (Functions and Errors)
+
+    Replace the following sentence from section 3.3.7 Rendering Contexts:
+	If ctx is current to some other thread, then
+	glXMakeContextCurrent will generate a BadAccess error.
+    with:
+	If ctx is an indirect context current to some other thread,
+	then glXMakeContextCurrent will generate a BadAccess error.
+
+    Replace the following sentence from section 3.5 Rendering Contexts:
+	If ctx is current to some other thread, then
+	glXMakeCurrent will generate a BadAccess error.
+    with:
+	If ctx is an indirect context current to some other thread,
+	then glXMakeCurrent will generate a BadAccess error.
+
+GLX Protocol
+
+    None.  The GLX extension only extends to direct rendering contexts.
+
+Errors
+
+    None.
+
+New State
+
+    None.
+
+Issues
+
+    (1) What happens if the app binds a context/drawable in multiple
+	threads, then binds a different context/thread in one of them?
+
+    As with binding a new context from the current thread, the old
+    context's refcount is reduced and the new context's refcount is
+    increased.
+
+    (2) What happens if the app binds a context/drawable in multiple
+	threads, then binds None/None in one of them?
+
+    The GLX context is unreferenced from that thread, and the other
+    threads retain their GLX context binding.
+
+    (3) What happens if the app binds a context/drawable in 7 threads,
+	then destroys the context in one of them?
+
+    As with GLX context destruction previously, the XID is destroyed
+    but the context remains usable by threads that have the context
+    current.
+
+    (4) What happens if the app binds a new drawable/readable with
+        glXMakeCurrent() when it is already bound to another thread?
+
+    The context becomes bound to the new drawable/readable, and
+    further rendering in either thread will use the new
+    drawable/readable.
+
+    (5) What requirements should be placed on the user managing contexts
+        from multiple threads?
+
+    The intention is to allow multithreaded access to the GL at the
+    minimal performance cost, so requiring that the GL do general
+    synchronization (beyond that already required by context sharing)
+    is not an option, and synchronizing of GL's access to the GL
+    context between multiple threads is left to the application to do
+    across GL calls.  However, it would be unfortunate for a library
+    doing multithread_makecurrent to require that other libraries
+    share in synchronization for binding of their own contexts, so the
+    refcounting of the contexts is required to be threadsafe.
+
+    (6) Does this apply to indirect contexts?
+
+    This was ignored in the initial revision of the spec.  Behavior
+    for indirect contexts is left as-is.
+
+Revision History
+
+    20 November 2009 Eric Anholt - initial specification
+    22 November 2009 Eric Anholt - added issues from Ian Romanick.
+    3 February 2011 Eric Anholt - updated with resolution to issues 1-3
+    3 February 2011 Eric Anholt - added issue 4, 5
+    21 February 2011 Eric Anholt - Include glXMakeCurrent() sentence
+    along with glXMakeContextCurrent() for removal.
diff --git a/mesalib/docs/relnotes-7.11.html b/mesalib/docs/relnotes-7.11.html
index 8bc3e2997..d006d35a1 100644
--- a/mesalib/docs/relnotes-7.11.html
+++ b/mesalib/docs/relnotes-7.11.html
@@ -38,6 +38,7 @@ tbd
 <ul>

 <li>GL_ARB_draw_instanced extension (gallium drivers, swrast)

 <li>GL_ARB_instanced_arrays extension (gallium drivers)

+<li>GL_ARB_texture_compression_rgtc (gallium r600, swrast)

 <li>GL_ARB_draw_buffers_blend (gallium)

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

 </ul>

diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index f964b7487..7660cb3dd 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -208,6 +208,6 @@ builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
 

 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler

 	@echo Regenerating builtin_function.cpp...

-	$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp

+	$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp

 

 -include depend

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 9f58b45e2..1b540e99a 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -428,6 +428,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
    ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;

    ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

    ctx->Extensions.ARB_texture_rg = GL_TRUE;

+   ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;

    ctx->Extensions.ARB_vertex_array_object = GL_TRUE;

 #if FEATURE_ARB_vertex_program

    ctx->Extensions.ARB_vertex_program = GL_TRUE;

diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 5c9b3068e..1d7bdad24 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -890,7 +890,43 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       16, 16, 16, 16,

       0, 0, 0, 0, 0,

       1, 1, 8

-   }

+   },

+   {

+     MESA_FORMAT_RED_RGTC1,

+     "MESA_FORMAT_RED_RGTC1",

+     GL_RED,

+     GL_UNSIGNED_NORMALIZED,

+     4, 0, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_RED_RGTC1,

+     "MESA_FORMAT_SIGNED_RED_RGTC1",

+     GL_RED,

+     GL_SIGNED_NORMALIZED,

+     4, 0, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 8                     /* 8 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_RG_RGTC2,

+     "MESA_FORMAT_RG_RGTC2",

+     GL_RG,

+     GL_UNSIGNED_NORMALIZED,

+     4, 4, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

+   {

+     MESA_FORMAT_SIGNED_RG_RGTC2,

+     "MESA_FORMAT_SIGNED_RG_RGTC2",

+     GL_RG,

+     GL_SIGNED_NORMALIZED,

+     4, 4, 0, 0,

+     0, 0, 0, 0, 0,

+     4, 4, 16                     /* 16 bytes per 4x4 block */

+   },

 };

 

 

@@ -1530,6 +1566,10 @@ _mesa_format_to_type_and_comps(gl_format format,
    case MESA_FORMAT_SRGBA_DXT5:

 #endif

 #endif

+   case MESA_FORMAT_RED_RGTC1:

+   case MESA_FORMAT_SIGNED_RED_RGTC1:

+   case MESA_FORMAT_RG_RGTC2:

+   case MESA_FORMAT_SIGNED_RG_RGTC2:

       /* XXX generate error instead? */

       *datatype = GL_UNSIGNED_BYTE;

       *comps = 0;

diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index cd7e0e25e..b32829145 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -179,6 +179,12 @@ typedef enum
    MESA_FORMAT_RGBA_16,           /* ... */

    /*@}*/

 

+   /*@{*/

+   MESA_FORMAT_RED_RGTC1,

+   MESA_FORMAT_SIGNED_RED_RGTC1,

+   MESA_FORMAT_RG_RGTC2,

+   MESA_FORMAT_SIGNED_RG_RGTC2,

+   /*@}*/

    MESA_FORMAT_COUNT

 } gl_format;

 

diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index eaebb06d3..9891946df 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -64,6 +64,7 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean a
          n += 2;

       }

    }

+   /* don't return RGTC - ARB_texture_compression_rgtc query 19 */

    if (ctx->Extensions.EXT_texture_compression_s3tc) {

       if (formats) {

          formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;

@@ -163,6 +164,15 @@ _mesa_glenum_to_compressed_format(GLenum format)
    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

       return MESA_FORMAT_SRGBA_DXT5;

 

+   case GL_COMPRESSED_RED_RGTC1:

+      return MESA_FORMAT_RED_RGTC1;

+   case GL_COMPRESSED_SIGNED_RED_RGTC1:

+      return MESA_FORMAT_SIGNED_RED_RGTC1;

+   case GL_COMPRESSED_RG_RGTC2:

+      return MESA_FORMAT_RG_RGTC2;

+   case GL_COMPRESSED_SIGNED_RG_RGTC2:

+      return MESA_FORMAT_SIGNED_RG_RGTC2;

+

    default:

       return MESA_FORMAT_NONE;

    }

@@ -209,6 +219,16 @@ _mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat)
       return GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;

 #endif

 #endif

+

+   case MESA_FORMAT_RED_RGTC1:

+      return GL_COMPRESSED_RED_RGTC1;

+   case MESA_FORMAT_SIGNED_RED_RGTC1:

+      return GL_COMPRESSED_SIGNED_RED_RGTC1;

+   case MESA_FORMAT_RG_RGTC2:

+      return GL_COMPRESSED_RG_RGTC2;

+   case MESA_FORMAT_SIGNED_RG_RGTC2:

+      return GL_COMPRESSED_SIGNED_RG_RGTC2;

+

    default:

       _mesa_problem(ctx, "Unexpected mesa texture format in"

                     " _mesa_compressed_format_to_glenum()");

diff --git a/mesalib/src/mesa/main/texcompress_rgtc.c b/mesalib/src/mesa/main/texcompress_rgtc.c
new file mode 100644
index 000000000..586715083
--- /dev/null
+++ b/mesalib/src/mesa/main/texcompress_rgtc.c
@@ -0,0 +1,1122 @@
+/*
+ * Copyright (C) 2011 Red Hat Inc.
+ * 
+ * block compression parts are:
+ * Copyright (C) 2004  Roland Scheidegger   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author:
+ *    Dave Airlie
+ */
+
+/**
+ * \file texcompress_rgtc.c
+ * GL_EXT_texture_compression_rgtc support.
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "colormac.h"
+#include "image.h"
+#include "macros.h"
+#include "mfeatures.h"
+#include "mipmap.h"
+#include "texcompress.h"
+#include "texcompress_rgtc.h"
+#include "texstore.h"
+
+#define RGTC_DEBUG 0
+
+static void encode_rgtc_chan_u(GLubyte *blkaddr, GLubyte srccolors[4][4],
+			     GLint numxpixels, GLint numypixels);
+static void encode_rgtc_chan_s(GLbyte *blkaddr, GLbyte srccolors[4][4],
+			     GLint numxpixels, GLint numypixels);
+
+static void extractsrc_u( GLubyte srcpixels[4][4], const GLchan *srcaddr,
+			  GLint srcRowStride, GLint numxpixels, GLint numypixels, GLint comps)
+{
+   GLubyte i, j;
+   const GLchan *curaddr;
+   for (j = 0; j < numypixels; j++) {
+      curaddr = srcaddr + j * srcRowStride * comps;
+      for (i = 0; i < numxpixels; i++) {
+	 srcpixels[j][i] = *curaddr / (CHAN_MAX / 255);
+	 curaddr += comps;
+      }
+   }
+}
+
+static void extractsrc_s( GLbyte srcpixels[4][4], const GLfloat *srcaddr,
+			  GLint srcRowStride, GLint numxpixels, GLint numypixels, GLint comps)
+{
+   GLubyte i, j;
+   const GLfloat *curaddr;
+   for (j = 0; j < numypixels; j++) {
+      curaddr = srcaddr + j * srcRowStride * comps;
+      for (i = 0; i < numxpixels; i++) {
+	 srcpixels[j][i] = FLOAT_TO_BYTE_TEX(*curaddr);
+	 curaddr += comps;
+      }
+   }
+}
+
+
+GLboolean
+_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS)
+{
+   GLubyte *dst;
+   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
+   const GLchan *tempImage = NULL;
+   int i, j;
+   int numxpixels, numypixels;
+   const char *srcaddr;
+   GLubyte srcpixels[4][4];
+   GLubyte *blkaddr;
+   GLint dstRowDiff;
+   ASSERT(dstFormat == MESA_FORMAT_RED_RGTC1);
+   ASSERT(dstXoffset % 4 == 0);
+   ASSERT(dstYoffset % 4 == 0);
+   ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
+
+
+   tempImage = _mesa_make_temp_chan_image(ctx, dims,
+					  baseInternalFormat,
+					  _mesa_get_format_base_format(dstFormat),
+					  srcWidth, srcHeight, srcDepth,
+					  srcFormat, srcType, srcAddr,
+					  srcPacking);
+   if (!tempImage)
+      return GL_FALSE; /* out of memory */
+
+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
+                                        dstFormat,
+                                        texWidth, (GLubyte *) dstAddr);
+
+   blkaddr = dst;
+   dstRowDiff = dstRowStride >= (srcWidth * 4) ? dstRowStride - (((srcWidth + 3) & ~3) * 4) : 0;
+   for (j = 0; j < srcHeight; j+=4) {
+      if (srcHeight > j + 3) numypixels = 4;
+      else numypixels = srcHeight - j;
+      srcaddr = tempImage + j * srcWidth;
+      for (i = 0; i < srcWidth; i += 4) {
+	 if (srcWidth > i + 3) numxpixels = 4;
+	 else numxpixels = srcWidth - i;
+	 extractsrc_u(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 1);
+	 encode_rgtc_chan_u(blkaddr, srcpixels, numxpixels, numypixels);
+	 srcaddr += numxpixels;
+	 blkaddr += 8;
+      }
+      blkaddr += dstRowDiff;
+   }
+   if (tempImage)
+      free((void *) tempImage);
+
+   return GL_TRUE;
+}
+
+GLboolean
+_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS)
+{
+   GLbyte *dst;
+   const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
+   const GLfloat *tempImage = NULL;
+   int i, j;
+   int numxpixels, numypixels;
+   const GLfloat *srcaddr;
+   GLbyte srcpixels[4][4];
+   GLbyte *blkaddr;
+   GLint dstRowDiff;
+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RED_RGTC1);
+   ASSERT(dstXoffset % 4 == 0);
+   ASSERT(dstYoffset % 4 == 0);
+   ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
+
+   tempImage = _mesa_make_temp_float_image(ctx, dims,
+					   baseInternalFormat,
+					   _mesa_get_format_base_format(dstFormat),
+					   srcWidth, srcHeight, srcDepth,
+					   srcFormat, srcType, srcAddr,
+					   srcPacking, 0x0);
+   if (!tempImage)
+      return GL_FALSE; /* out of memory */
+
+   dst = (GLbyte *)_mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
+						  dstFormat,
+						  texWidth, (GLubyte *) dstAddr);
+
+   blkaddr = dst;
+   dstRowDiff = dstRowStride >= (srcWidth * 4) ? dstRowStride - (((srcWidth + 3) & ~3) * 4) : 0;
+   for (j = 0; j < srcHeight; j+=4) {
+      if (srcHeight > j + 3) numypixels = 4;
+      else numypixels = srcHeight - j;
+      srcaddr = tempImage + j * srcWidth;
+      for (i = 0; i < srcWidth; i += 4) {
+	 if (srcWidth > i + 3) numxpixels = 4;
+	 else numxpixels = srcWidth - i;
+	 extractsrc_s(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 1);
+	 encode_rgtc_chan_s(blkaddr, srcpixels, numxpixels, numypixels);
+	 srcaddr += numxpixels;
+	 blkaddr += 8;
+      }
+      blkaddr += dstRowDiff;
+   }
+   if (tempImage)
+      free((void *) tempImage);
+
+   return GL_TRUE;
+}
+
+GLboolean
+_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS)
+{
+   GLubyte *dst;
+   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
+   const GLchan *tempImage = NULL;
+   int i, j;
+   int numxpixels, numypixels;
+   const char *srcaddr;
+   GLubyte srcpixels[4][4];
+   GLubyte *blkaddr;
+   GLint dstRowDiff;
+
+   ASSERT(dstFormat == MESA_FORMAT_RG_RGTC2);
+   ASSERT(dstXoffset % 4 == 0);
+   ASSERT(dstYoffset % 4 == 0);
+   ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
+
+   tempImage = _mesa_make_temp_chan_image(ctx, dims,
+					  baseInternalFormat,
+					  _mesa_get_format_base_format(dstFormat),
+					  srcWidth, srcHeight, srcDepth,
+					  srcFormat, srcType, srcAddr,
+					  srcPacking);
+   if (!tempImage)
+      return GL_FALSE; /* out of memory */
+
+   dst = _mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
+                                        dstFormat,
+                                        texWidth, (GLubyte *) dstAddr);
+
+   blkaddr = dst;
+   dstRowDiff = dstRowStride >= (srcWidth * 8) ? dstRowStride - (((srcWidth + 7) & ~7) * 8) : 0;
+   for (j = 0; j < srcHeight; j+=4) {
+      if (srcHeight > j + 3) numypixels = 4;
+      else numypixels = srcHeight - j;
+      srcaddr = tempImage + j * srcWidth * 2;
+      for (i = 0; i < srcWidth; i += 4) {
+	 if (srcWidth > i + 3) numxpixels = 4;
+	 else numxpixels = srcWidth - i;
+	 extractsrc_u(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 2);
+	 encode_rgtc_chan_u(blkaddr, srcpixels, numxpixels, numypixels);
+
+	 blkaddr += 8;
+	 extractsrc_u(srcpixels, (GLchan *)srcaddr + 1, srcWidth, numxpixels, numypixels, 2);
+	 encode_rgtc_chan_u(blkaddr, srcpixels, numxpixels, numypixels);
+
+	 blkaddr += 8;
+
+	 srcaddr += numxpixels * 2;
+      }
+      blkaddr += dstRowDiff;
+   }
+   if (tempImage)
+      free((void *) tempImage);
+
+   return GL_TRUE;
+}
+
+GLboolean
+_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
+{
+   GLbyte *dst;
+   const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
+   const GLfloat *tempImage = NULL;
+   int i, j;
+   int numxpixels, numypixels;
+   const GLfloat *srcaddr;
+   GLbyte srcpixels[4][4];
+   GLbyte *blkaddr;
+   GLint dstRowDiff;
+
+   ASSERT(dstFormat == MESA_FORMAT_SIGNED_RG_RGTC2);
+   ASSERT(dstXoffset % 4 == 0);
+   ASSERT(dstYoffset % 4 == 0);
+   ASSERT(dstZoffset % 4 == 0);
+   (void) dstZoffset;
+   (void) dstImageOffsets;
+
+   tempImage = _mesa_make_temp_float_image(ctx, dims,
+					   baseInternalFormat,
+					   _mesa_get_format_base_format(dstFormat),
+					   srcWidth, srcHeight, srcDepth,
+					   srcFormat, srcType, srcAddr,
+					   srcPacking, 0x0);
+   if (!tempImage)
+      return GL_FALSE; /* out of memory */
+
+   dst = (GLbyte *)_mesa_compressed_image_address(dstXoffset, dstYoffset, 0,
+						  dstFormat,
+						  texWidth, (GLubyte *) dstAddr);
+
+   blkaddr = dst;
+   dstRowDiff = dstRowStride >= (srcWidth * 8) ? dstRowStride - (((srcWidth + 7) & ~7) * 8) : 0;
+   for (j = 0; j < srcHeight; j += 4) {
+      if (srcHeight > j + 3) numypixels = 4;
+      else numypixels = srcHeight - j;
+      srcaddr = tempImage + j * srcWidth * 2;
+      for (i = 0; i < srcWidth; i += 4) {
+	 if (srcWidth > i + 3) numxpixels = 4;
+	 else numxpixels = srcWidth - i;
+
+	 extractsrc_s(srcpixels, srcaddr, srcWidth, numxpixels, numypixels, 2);
+	 encode_rgtc_chan_s(blkaddr, srcpixels, numxpixels, numypixels);
+	 blkaddr += 8;
+
+	 extractsrc_s(srcpixels, srcaddr + 1, srcWidth, numxpixels, numypixels, 2);
+	 encode_rgtc_chan_s(blkaddr, srcpixels, numxpixels, numypixels);
+	 blkaddr += 8;
+
+	 srcaddr += numxpixels * 2;
+
+      }
+      blkaddr += dstRowDiff;
+   }
+   if (tempImage)
+      free((void *) tempImage);
+
+   return GL_TRUE;
+}
+
+static void _fetch_texel_rgtc_u(GLint srcRowStride, const GLubyte *pixdata,
+				GLint i, GLint j, GLchan *value, int comps)
+{
+   GLchan decode;
+   const GLubyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8 * comps);
+   const GLubyte alpha0 = blksrc[0];
+   const GLubyte alpha1 = blksrc[1];
+   const GLubyte bit_pos = ((j&3) * 4 + (i&3)) * 3;
+   const GLubyte acodelow = blksrc[2 + bit_pos / 8];
+   const GLubyte acodehigh = blksrc[3 + bit_pos / 8];
+   const GLubyte code = (acodelow >> (bit_pos & 0x7) |
+      (acodehigh  << (8 - (bit_pos & 0x7)))) & 0x7;
+
+   if (code == 0)
+      decode = UBYTE_TO_CHAN( alpha0 );
+   else if (code == 1)
+      decode = UBYTE_TO_CHAN( alpha1 );
+   else if (alpha0 > alpha1)
+      decode = UBYTE_TO_CHAN( ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7) );
+   else if (code < 6)
+      decode = UBYTE_TO_CHAN( ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5) );
+   else if (code == 6)
+      decode = 0;
+   else
+      decode = CHAN_MAX;
+
+   *value = decode;
+}
+
+
+static void _fetch_texel_rgtc_s(GLint srcRowStride, const GLbyte *pixdata,
+				GLint i, GLint j, GLbyte *value, int comps)
+{
+   GLbyte decode;
+   const GLbyte *blksrc = (pixdata + ((srcRowStride + 3) / 4 * (j / 4) + (i / 4)) * 8 * comps);
+   const GLbyte alpha0 = blksrc[0];
+   const GLbyte alpha1 = blksrc[1];
+   const GLbyte bit_pos = ((j&3) * 4 + (i&3)) * 3;
+   const GLbyte acodelow = blksrc[2 + bit_pos / 8];
+   const GLbyte acodehigh = blksrc[3 + bit_pos / 8];
+   const GLbyte code = (acodelow >> (bit_pos & 0x7) |
+      (acodehigh  << (8 - (bit_pos & 0x7)))) & 0x7;
+
+   if (code == 0)
+      decode = alpha0;
+   else if (code == 1)
+      decode = alpha1;
+   else if (alpha0 > alpha1)
+      decode = ((alpha0 * (8 - code) + (alpha1 * (code - 1))) / 7);
+   else if (code < 6)
+      decode = ((alpha0 * (6 - code) + (alpha1 * (code - 1))) / 5);
+   else if (code == 6)
+      decode = -128;
+   else
+      decode = 127;
+
+   *value = decode;
+}
+
+void
+_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,
+				 GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   GLchan red;
+   _fetch_texel_rgtc_u(texImage->RowStride, (GLubyte *)(texImage->Data),
+		       i, j, &red, 1);
+   texel[RCOMP] = CHAN_TO_FLOAT(red);
+   texel[GCOMP] = 0.0;
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+void
+_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,
+					GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   GLbyte red;
+   _fetch_texel_rgtc_s(texImage->RowStride, (GLbyte *)(texImage->Data),
+		       i, j, &red, 1);
+   texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
+   texel[GCOMP] = 0.0;
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+void
+_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,
+				 GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   GLchan red, green;
+   _fetch_texel_rgtc_u(texImage->RowStride, (GLubyte *)(texImage->Data),
+		     i, j, &red, 2);
+   _fetch_texel_rgtc_u(texImage->RowStride, (GLubyte *)(texImage->Data) + 8,
+		     i, j, &green, 2);
+   texel[RCOMP] = CHAN_TO_FLOAT(red);
+   texel[GCOMP] = CHAN_TO_FLOAT(green);
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+void
+_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
+				       GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   GLbyte red, green;
+   _fetch_texel_rgtc_s(texImage->RowStride, (GLbyte *)(texImage->Data),
+		     i, j, &red, 2);
+   _fetch_texel_rgtc_s(texImage->RowStride, (GLbyte *)(texImage->Data) + 8,
+		     i, j, &green, 2);
+   texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
+   texel[GCOMP] = BYTE_TO_FLOAT_TEX(green);
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+static void write_rgtc_encoded_channel(GLubyte *blkaddr,
+				       GLubyte alphabase1,
+				       GLubyte alphabase2,
+				       GLubyte alphaenc[16])
+{
+   *blkaddr++ = alphabase1;
+   *blkaddr++ = alphabase2;
+   *blkaddr++ = alphaenc[0] | (alphaenc[1] << 3) | ((alphaenc[2] & 3) << 6);
+   *blkaddr++ = (alphaenc[2] >> 2) | (alphaenc[3] << 1) | (alphaenc[4] << 4) | ((alphaenc[5] & 1) << 7);
+   *blkaddr++ = (alphaenc[5] >> 1) | (alphaenc[6] << 2) | (alphaenc[7] << 5);
+   *blkaddr++ = alphaenc[8] | (alphaenc[9] << 3) | ((alphaenc[10] & 3) << 6);
+   *blkaddr++ = (alphaenc[10] >> 2) | (alphaenc[11] << 1) | (alphaenc[12] << 4) | ((alphaenc[13] & 1) << 7);
+   *blkaddr++ = (alphaenc[13] >> 1) | (alphaenc[14] << 2) | (alphaenc[15] << 5);
+}
+
+static void encode_rgtc_chan_u(GLubyte *blkaddr, GLubyte srccolors[4][4],
+			     GLint numxpixels, GLint numypixels)
+{
+   GLubyte alphabase[2], alphause[2];
+   GLshort alphatest[2] = { 0 };
+   GLuint alphablockerror1, alphablockerror2, alphablockerror3;
+   GLubyte i, j, aindex, acutValues[7];
+   GLubyte alphaenc1[16], alphaenc2[16], alphaenc3[16];
+   GLboolean alphaabsmin = GL_FALSE;
+   GLboolean alphaabsmax = GL_FALSE;
+   GLshort alphadist;
+
+   /* find lowest and highest alpha value in block, alphabase[0] lowest, alphabase[1] highest */
+   alphabase[0] = 0xff; alphabase[1] = 0x0;
+   for (j = 0; j < numypixels; j++) {
+      for (i = 0; i < numxpixels; i++) {
+         if (srccolors[j][i] == 0)
+            alphaabsmin = GL_TRUE;
+         else if (srccolors[j][i] == 255)
+            alphaabsmax = GL_TRUE;
+         else {
+            if (srccolors[j][i] > alphabase[1])
+               alphabase[1] = srccolors[j][i];
+            if (srccolors[j][i] < alphabase[0])
+               alphabase[0] = srccolors[j][i];
+         }
+      }
+   }
+
+
+   if ((alphabase[0] > alphabase[1]) && !(alphaabsmin && alphaabsmax)) { /* one color, either max or min */
+      /* shortcut here since it is a very common case (and also avoids later problems) */
+      /* || (alphabase[0] == alphabase[1] && !alphaabsmin && !alphaabsmax) */
+      /* could also thest for alpha0 == alpha1 (and not min/max), but probably not common, so don't bother */
+
+      *blkaddr++ = srccolors[0][0];
+      blkaddr++;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+#if RGTC_DEBUG
+      fprintf(stderr, "enc0 used\n");
+#endif
+      return;
+   }
+
+   /* find best encoding for alpha0 > alpha1 */
+   /* it's possible this encoding is better even if both alphaabsmin and alphaabsmax are true */
+   alphablockerror1 = 0x0;
+   alphablockerror2 = 0xffffffff;
+   alphablockerror3 = 0xffffffff;
+   if (alphaabsmin) alphause[0] = 0;
+   else alphause[0] = alphabase[0];
+   if (alphaabsmax) alphause[1] = 255;
+   else alphause[1] = alphabase[1];
+   /* calculate the 7 cut values, just the middle between 2 of the computed alpha values */
+   for (aindex = 0; aindex < 7; aindex++) {
+      /* don't forget here is always rounded down */
+      acutValues[aindex] = (alphause[0] * (2*aindex + 1) + alphause[1] * (14 - (2*aindex + 1))) / 14;
+   }
+
+   for (j = 0; j < numypixels; j++) {
+      for (i = 0; i < numxpixels; i++) {
+         /* maybe it's overkill to have the most complicated calculation just for the error
+            calculation which we only need to figure out if encoding1 or encoding2 is better... */
+         if (srccolors[j][i] > acutValues[0]) {
+            alphaenc1[4*j + i] = 0;
+            alphadist = srccolors[j][i] - alphause[1];
+         }
+         else if (srccolors[j][i] > acutValues[1]) {
+            alphaenc1[4*j + i] = 2;
+            alphadist = srccolors[j][i] - (alphause[1] * 6 + alphause[0] * 1) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[2]) {
+            alphaenc1[4*j + i] = 3;
+            alphadist = srccolors[j][i] - (alphause[1] * 5 + alphause[0] * 2) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[3]) {
+            alphaenc1[4*j + i] = 4;
+            alphadist = srccolors[j][i] - (alphause[1] * 4 + alphause[0] * 3) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[4]) {
+            alphaenc1[4*j + i] = 5;
+            alphadist = srccolors[j][i] - (alphause[1] * 3 + alphause[0] * 4) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[5]) {
+            alphaenc1[4*j + i] = 6;
+            alphadist = srccolors[j][i] - (alphause[1] * 2 + alphause[0] * 5) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[6]) {
+            alphaenc1[4*j + i] = 7;
+            alphadist = srccolors[j][i] - (alphause[1] * 1 + alphause[0] * 6) / 7;
+         }
+         else {
+            alphaenc1[4*j + i] = 1;
+            alphadist = srccolors[j][i] - alphause[0];
+         }
+         alphablockerror1 += alphadist * alphadist;
+      }
+   }
+
+#if RGTC_DEBUG
+   for (i = 0; i < 16; i++) {
+      fprintf(stderr, "%d ", alphaenc1[i]);
+   }
+   fprintf(stderr, "cutVals ");
+   for (i = 0; i < 8; i++) {
+      fprintf(stderr, "%d ", acutValues[i]);
+   }
+   fprintf(stderr, "srcVals ");
+   for (j = 0; j < numypixels; j++) {
+      for (i = 0; i < numxpixels; i++) {
+	 fprintf(stderr, "%d ", srccolors[j][i]);
+      }
+   }
+   fprintf(stderr, "\n");
+#endif
+
+   /* it's not very likely this encoding is better if both alphaabsmin and alphaabsmax
+      are false but try it anyway */
+   if (alphablockerror1 >= 32) {
+
+      /* don't bother if encoding is already very good, this condition should also imply
+      we have valid alphabase colors which we absolutely need (alphabase[0] <= alphabase[1]) */
+      alphablockerror2 = 0;
+      for (aindex = 0; aindex < 5; aindex++) {
+         /* don't forget here is always rounded down */
+         acutValues[aindex] = (alphabase[0] * (10 - (2*aindex + 1)) + alphabase[1] * (2*aindex + 1)) / 10;
+      }
+      for (j = 0; j < numypixels; j++) {
+         for (i = 0; i < numxpixels; i++) {
+             /* maybe it's overkill to have the most complicated calculation just for the error
+               calculation which we only need to figure out if encoding1 or encoding2 is better... */
+            if (srccolors[j][i] == 0) {
+               alphaenc2[4*j + i] = 6;
+               alphadist = 0;
+            }
+            else if (srccolors[j][i] == 255) {
+               alphaenc2[4*j + i] = 7;
+               alphadist = 0;
+            }
+            else if (srccolors[j][i] <= acutValues[0]) {
+               alphaenc2[4*j + i] = 0;
+               alphadist = srccolors[j][i] - alphabase[0];
+            }
+            else if (srccolors[j][i] <= acutValues[1]) {
+               alphaenc2[4*j + i] = 2;
+               alphadist = srccolors[j][i] - (alphabase[0] * 4 + alphabase[1] * 1) / 5;
+            }
+            else if (srccolors[j][i] <= acutValues[2]) {
+               alphaenc2[4*j + i] = 3;
+               alphadist = srccolors[j][i] - (alphabase[0] * 3 + alphabase[1] * 2) / 5;
+            }
+            else if (srccolors[j][i] <= acutValues[3]) {
+               alphaenc2[4*j + i] = 4;
+               alphadist = srccolors[j][i] - (alphabase[0] * 2 + alphabase[1] * 3) / 5;
+            }
+            else if (srccolors[j][i] <= acutValues[4]) {
+               alphaenc2[4*j + i] = 5;
+               alphadist = srccolors[j][i] - (alphabase[0] * 1 + alphabase[1] * 4) / 5;
+            }
+            else {
+               alphaenc2[4*j + i] = 1;
+               alphadist = srccolors[j][i] - alphabase[1];
+            }
+            alphablockerror2 += alphadist * alphadist;
+         }
+      }
+
+
+      /* skip this if the error is already very small
+         this encoding is MUCH better on average than #2 though, but expensive! */
+      if ((alphablockerror2 > 96) && (alphablockerror1 > 96)) {
+         GLshort blockerrlin1 = 0;
+         GLshort blockerrlin2 = 0;
+         GLubyte nralphainrangelow = 0;
+         GLubyte nralphainrangehigh = 0;
+         alphatest[0] = 0xff;
+         alphatest[1] = 0x0;
+         /* if we have large range it's likely there are values close to 0/255, try to map them to 0/255 */
+         for (j = 0; j < numypixels; j++) {
+            for (i = 0; i < numxpixels; i++) {
+               if ((srccolors[j][i] > alphatest[1]) && (srccolors[j][i] < (255 -(alphabase[1] - alphabase[0]) / 28)))
+                  alphatest[1] = srccolors[j][i];
+               if ((srccolors[j][i] < alphatest[0]) && (srccolors[j][i] > (alphabase[1] - alphabase[0]) / 28))
+                  alphatest[0] = srccolors[j][i];
+            }
+         }
+          /* shouldn't happen too often, don't really care about those degenerated cases */
+          if (alphatest[1] <= alphatest[0]) {
+             alphatest[0] = 1;
+             alphatest[1] = 254;
+         }
+         for (aindex = 0; aindex < 5; aindex++) {
+         /* don't forget here is always rounded down */
+            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;
+         }
+
+         /* find the "average" difference between the alpha values and the next encoded value.
+            This is then used to calculate new base values.
+            Should there be some weighting, i.e. those values closer to alphatest[x] have more weight,
+            since they will see more improvement, and also because the values in the middle are somewhat
+            likely to get no improvement at all (because the base values might move in different directions)?
+            OTOH it would mean the values in the middle are even less likely to get an improvement
+         */
+         for (j = 0; j < numypixels; j++) {
+            for (i = 0; i < numxpixels; i++) {
+               if (srccolors[j][i] <= alphatest[0] / 2) {
+               }
+               else if (srccolors[j][i] > ((255 + alphatest[1]) / 2)) {
+               }
+               else if (srccolors[j][i] <= acutValues[0]) {
+                  blockerrlin1 += (srccolors[j][i] - alphatest[0]);
+                  nralphainrangelow += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[1]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[2]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[3]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[4]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+                  }
+               else {
+                  blockerrlin2 += (srccolors[j][i] - alphatest[1]);
+                  nralphainrangehigh += 1;
+               }
+            }
+         }
+         /* shouldn't happen often, needed to avoid div by zero */
+         if (nralphainrangelow == 0) nralphainrangelow = 1;
+         if (nralphainrangehigh == 0) nralphainrangehigh = 1;
+         alphatest[0] = alphatest[0] + (blockerrlin1 / nralphainrangelow);
+#if RGTC_DEBUG
+         fprintf(stderr, "block err lin low %d, nr %d\n", blockerrlin1, nralphainrangelow);
+         fprintf(stderr, "block err lin high %d, nr %d\n", blockerrlin2, nralphainrangehigh);
+#endif
+         /* again shouldn't really happen often... */
+         if (alphatest[0] < 0) {
+            alphatest[0] = 0;
+         }
+         alphatest[1] = alphatest[1] + (blockerrlin2 / nralphainrangehigh);
+         if (alphatest[1] > 255) {
+            alphatest[1] = 255;
+         }
+
+         alphablockerror3 = 0;
+         for (aindex = 0; aindex < 5; aindex++) {
+         /* don't forget here is always rounded down */
+            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;
+         }
+         for (j = 0; j < numypixels; j++) {
+            for (i = 0; i < numxpixels; i++) {
+                /* maybe it's overkill to have the most complicated calculation just for the error
+                  calculation which we only need to figure out if encoding1 or encoding2 is better... */
+               if (srccolors[j][i] <= alphatest[0] / 2) {
+                  alphaenc3[4*j + i] = 6;
+                  alphadist = srccolors[j][i];
+               }
+               else if (srccolors[j][i] > ((255 + alphatest[1]) / 2)) {
+                  alphaenc3[4*j + i] = 7;
+                  alphadist = 255 - srccolors[j][i];
+               }
+               else if (srccolors[j][i] <= acutValues[0]) {
+                  alphaenc3[4*j + i] = 0;
+                  alphadist = srccolors[j][i] - alphatest[0];
+               }
+               else if (srccolors[j][i] <= acutValues[1]) {
+                 alphaenc3[4*j + i] = 2;
+                 alphadist = srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5;
+               }
+               else if (srccolors[j][i] <= acutValues[2]) {
+                  alphaenc3[4*j + i] = 3;
+                  alphadist = srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5;
+               }
+               else if (srccolors[j][i] <= acutValues[3]) {
+                  alphaenc3[4*j + i] = 4;
+                  alphadist = srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5;
+               }
+               else if (srccolors[j][i] <= acutValues[4]) {
+                  alphaenc3[4*j + i] = 5;
+                  alphadist = srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5;
+               }
+               else {
+                  alphaenc3[4*j + i] = 1;
+                  alphadist = srccolors[j][i] - alphatest[1];
+               }
+               alphablockerror3 += alphadist * alphadist;
+            }
+         }
+      }
+   }
+  /* write the alpha values and encoding back. */
+   if ((alphablockerror1 <= alphablockerror2) && (alphablockerror1 <= alphablockerror3)) {
+#if RGTC_DEBUG
+      if (alphablockerror1 > 96) fprintf(stderr, "enc1 used, error %d\n", alphablockerror1);
+#endif
+      write_rgtc_encoded_channel( blkaddr, alphause[1], alphause[0], alphaenc1 );
+   }
+   else if (alphablockerror2 <= alphablockerror3) {
+#if RGTC_DEBUG
+      if (alphablockerror2 > 96) fprintf(stderr, "enc2 used, error %d\n", alphablockerror2);
+#endif
+      write_rgtc_encoded_channel( blkaddr, alphabase[0], alphabase[1], alphaenc2 );
+   }
+   else {
+#if RGTC_DEBUG
+      fprintf(stderr, "enc3 used, error %d\n", alphablockerror3);
+#endif
+      write_rgtc_encoded_channel( blkaddr, (GLubyte)alphatest[0], (GLubyte)alphatest[1], alphaenc3 );
+   }
+}
+
+
+static void write_rgtc_encoded_channel_s(GLbyte *blkaddr,
+					 GLbyte alphabase1,
+					 GLbyte alphabase2,
+					 GLbyte alphaenc[16])
+{
+   *blkaddr++ = alphabase1;
+   *blkaddr++ = alphabase2;
+   *blkaddr++ = alphaenc[0] | (alphaenc[1] << 3) | ((alphaenc[2] & 3) << 6);
+   *blkaddr++ = (alphaenc[2] >> 2) | (alphaenc[3] << 1) | (alphaenc[4] << 4) | ((alphaenc[5] & 1) << 7);
+   *blkaddr++ = (alphaenc[5] >> 1) | (alphaenc[6] << 2) | (alphaenc[7] << 5);
+   *blkaddr++ = alphaenc[8] | (alphaenc[9] << 3) | ((alphaenc[10] & 3) << 6);
+   *blkaddr++ = (alphaenc[10] >> 2) | (alphaenc[11] << 1) | (alphaenc[12] << 4) | ((alphaenc[13] & 1) << 7);
+   *blkaddr++ = (alphaenc[13] >> 1) | (alphaenc[14] << 2) | (alphaenc[15] << 5);
+}
+
+static void encode_rgtc_chan_s(GLbyte *blkaddr, GLbyte srccolors[4][4],
+			       GLint numxpixels, GLint numypixels)
+{
+   GLbyte alphabase[2], alphause[2];
+   GLshort alphatest[2] = { 0 };
+   GLuint alphablockerror1, alphablockerror2, alphablockerror3;
+   GLbyte i, j, aindex, acutValues[7];
+   GLbyte alphaenc1[16], alphaenc2[16], alphaenc3[16];
+   GLboolean alphaabsmin = GL_FALSE;
+   GLboolean alphaabsmax = GL_FALSE;
+   GLshort alphadist;
+
+   /* find lowest and highest alpha value in block, alphabase[0] lowest, alphabase[1] highest */
+   alphabase[0] = 0xff; alphabase[1] = 0x0;
+   for (j = 0; j < numypixels; j++) {
+      for (i = 0; i < numxpixels; i++) {
+         if (srccolors[j][i] == 0)
+            alphaabsmin = GL_TRUE;
+         else if (srccolors[j][i] == 255)
+            alphaabsmax = GL_TRUE;
+         else {
+            if (srccolors[j][i] > alphabase[1])
+               alphabase[1] = srccolors[j][i];
+            if (srccolors[j][i] < alphabase[0])
+               alphabase[0] = srccolors[j][i];
+         }
+      }
+   }
+
+
+   if ((alphabase[0] > alphabase[1]) && !(alphaabsmin && alphaabsmax)) { /* one color, either max or min */
+      /* shortcut here since it is a very common case (and also avoids later problems) */
+      /* || (alphabase[0] == alphabase[1] && !alphaabsmin && !alphaabsmax) */
+      /* could also thest for alpha0 == alpha1 (and not min/max), but probably not common, so don't bother */
+
+      *blkaddr++ = srccolors[0][0];
+      blkaddr++;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+      *blkaddr++ = 0;
+#if RGTC_DEBUG
+      fprintf(stderr, "enc0 used\n");
+#endif
+      return;
+   }
+
+   /* find best encoding for alpha0 > alpha1 */
+   /* it's possible this encoding is better even if both alphaabsmin and alphaabsmax are true */
+   alphablockerror1 = 0x0;
+   alphablockerror2 = 0xffffffff;
+   alphablockerror3 = 0xffffffff;
+   if (alphaabsmin) alphause[0] = 0;
+   else alphause[0] = alphabase[0];
+   if (alphaabsmax) alphause[1] = 255;
+   else alphause[1] = alphabase[1];
+   /* calculate the 7 cut values, just the middle between 2 of the computed alpha values */
+   for (aindex = 0; aindex < 7; aindex++) {
+      /* don't forget here is always rounded down */
+      acutValues[aindex] = (alphause[0] * (2*aindex + 1) + alphause[1] * (14 - (2*aindex + 1))) / 14;
+   }
+
+   for (j = 0; j < numypixels; j++) {
+      for (i = 0; i < numxpixels; i++) {
+         /* maybe it's overkill to have the most complicated calculation just for the error
+            calculation which we only need to figure out if encoding1 or encoding2 is better... */
+         if (srccolors[j][i] > acutValues[0]) {
+            alphaenc1[4*j + i] = 0;
+            alphadist = srccolors[j][i] - alphause[1];
+         }
+         else if (srccolors[j][i] > acutValues[1]) {
+            alphaenc1[4*j + i] = 2;
+            alphadist = srccolors[j][i] - (alphause[1] * 6 + alphause[0] * 1) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[2]) {
+            alphaenc1[4*j + i] = 3;
+            alphadist = srccolors[j][i] - (alphause[1] * 5 + alphause[0] * 2) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[3]) {
+            alphaenc1[4*j + i] = 4;
+            alphadist = srccolors[j][i] - (alphause[1] * 4 + alphause[0] * 3) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[4]) {
+            alphaenc1[4*j + i] = 5;
+            alphadist = srccolors[j][i] - (alphause[1] * 3 + alphause[0] * 4) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[5]) {
+            alphaenc1[4*j + i] = 6;
+            alphadist = srccolors[j][i] - (alphause[1] * 2 + alphause[0] * 5) / 7;
+         }
+         else if (srccolors[j][i] > acutValues[6]) {
+            alphaenc1[4*j + i] = 7;
+            alphadist = srccolors[j][i] - (alphause[1] * 1 + alphause[0] * 6) / 7;
+         }
+         else {
+            alphaenc1[4*j + i] = 1;
+            alphadist = srccolors[j][i] - alphause[0];
+         }
+         alphablockerror1 += alphadist * alphadist;
+      }
+   }
+#if RGTC_DEBUG
+   for (i = 0; i < 16; i++) {
+      fprintf(stderr, "%d ", alphaenc1[i]);
+   }
+   fprintf(stderr, "cutVals ");
+   for (i = 0; i < 8; i++) {
+      fprintf(stderr, "%d ", acutValues[i]);
+   }
+   fprintf(stderr, "srcVals ");
+   for (j = 0; j < numypixels; j++)
+      for (i = 0; i < numxpixels; i++) {
+	 fprintf(stderr, "%d ", srccolors[j][i]);
+      }
+   
+   fprintf(stderr, "\n");
+#endif
+
+   /* it's not very likely this encoding is better if both alphaabsmin and alphaabsmax
+      are false but try it anyway */
+   if (alphablockerror1 >= 32) {
+
+      /* don't bother if encoding is already very good, this condition should also imply
+      we have valid alphabase colors which we absolutely need (alphabase[0] <= alphabase[1]) */
+      alphablockerror2 = 0;
+      for (aindex = 0; aindex < 5; aindex++) {
+         /* don't forget here is always rounded down */
+         acutValues[aindex] = (alphabase[0] * (10 - (2*aindex + 1)) + alphabase[1] * (2*aindex + 1)) / 10;
+      }
+      for (j = 0; j < numypixels; j++) {
+         for (i = 0; i < numxpixels; i++) {
+             /* maybe it's overkill to have the most complicated calculation just for the error
+               calculation which we only need to figure out if encoding1 or encoding2 is better... */
+            if (srccolors[j][i] == 0) {
+               alphaenc2[4*j + i] = 6;
+               alphadist = 0;
+            }
+            else if (srccolors[j][i] == 255) {
+               alphaenc2[4*j + i] = 7;
+               alphadist = 0;
+            }
+            else if (srccolors[j][i] <= acutValues[0]) {
+               alphaenc2[4*j + i] = 0;
+               alphadist = srccolors[j][i] - alphabase[0];
+            }
+            else if (srccolors[j][i] <= acutValues[1]) {
+               alphaenc2[4*j + i] = 2;
+               alphadist = srccolors[j][i] - (alphabase[0] * 4 + alphabase[1] * 1) / 5;
+            }
+            else if (srccolors[j][i] <= acutValues[2]) {
+               alphaenc2[4*j + i] = 3;
+               alphadist = srccolors[j][i] - (alphabase[0] * 3 + alphabase[1] * 2) / 5;
+            }
+            else if (srccolors[j][i] <= acutValues[3]) {
+               alphaenc2[4*j + i] = 4;
+               alphadist = srccolors[j][i] - (alphabase[0] * 2 + alphabase[1] * 3) / 5;
+            }
+            else if (srccolors[j][i] <= acutValues[4]) {
+               alphaenc2[4*j + i] = 5;
+               alphadist = srccolors[j][i] - (alphabase[0] * 1 + alphabase[1] * 4) / 5;
+            }
+            else {
+               alphaenc2[4*j + i] = 1;
+               alphadist = srccolors[j][i] - alphabase[1];
+            }
+            alphablockerror2 += alphadist * alphadist;
+         }
+      }
+
+
+      /* skip this if the error is already very small
+         this encoding is MUCH better on average than #2 though, but expensive! */
+      if ((alphablockerror2 > 96) && (alphablockerror1 > 96)) {
+         GLshort blockerrlin1 = 0;
+         GLshort blockerrlin2 = 0;
+         GLubyte nralphainrangelow = 0;
+         GLubyte nralphainrangehigh = 0;
+         alphatest[0] = 0xff;
+         alphatest[1] = 0x0;
+         /* if we have large range it's likely there are values close to 0/255, try to map them to 0/255 */
+         for (j = 0; j < numypixels; j++) {
+            for (i = 0; i < numxpixels; i++) {
+               if ((srccolors[j][i] > alphatest[1]) && (srccolors[j][i] < (255 -(alphabase[1] - alphabase[0]) / 28)))
+                  alphatest[1] = srccolors[j][i];
+               if ((srccolors[j][i] < alphatest[0]) && (srccolors[j][i] > (alphabase[1] - alphabase[0]) / 28))
+                  alphatest[0] = srccolors[j][i];
+            }
+         }
+          /* shouldn't happen too often, don't really care about those degenerated cases */
+          if (alphatest[1] <= alphatest[0]) {
+             alphatest[0] = 1;
+             alphatest[1] = 254;
+         }
+         for (aindex = 0; aindex < 5; aindex++) {
+         /* don't forget here is always rounded down */
+            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;
+         }
+
+         /* find the "average" difference between the alpha values and the next encoded value.
+            This is then used to calculate new base values.
+            Should there be some weighting, i.e. those values closer to alphatest[x] have more weight,
+            since they will see more improvement, and also because the values in the middle are somewhat
+            likely to get no improvement at all (because the base values might move in different directions)?
+            OTOH it would mean the values in the middle are even less likely to get an improvement
+         */
+         for (j = 0; j < numypixels; j++) {
+            for (i = 0; i < numxpixels; i++) {
+               if (srccolors[j][i] <= alphatest[0] / 2) {
+               }
+               else if (srccolors[j][i] > ((255 + alphatest[1]) / 2)) {
+               }
+               else if (srccolors[j][i] <= acutValues[0]) {
+                  blockerrlin1 += (srccolors[j][i] - alphatest[0]);
+                  nralphainrangelow += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[1]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[2]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[3]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+               }
+               else if (srccolors[j][i] <= acutValues[4]) {
+                  blockerrlin1 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);
+                  blockerrlin2 += (srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5);
+                  nralphainrangelow += 1;
+                  nralphainrangehigh += 1;
+                  }
+               else {
+                  blockerrlin2 += (srccolors[j][i] - alphatest[1]);
+                  nralphainrangehigh += 1;
+               }
+            }
+         }
+         /* shouldn't happen often, needed to avoid div by zero */
+         if (nralphainrangelow == 0) nralphainrangelow = 1;
+         if (nralphainrangehigh == 0) nralphainrangehigh = 1;
+         alphatest[0] = alphatest[0] + (blockerrlin1 / nralphainrangelow);
+#if RGTC_DEBUG
+	 fprintf(stderr, "block err lin low %d, nr %d\n", blockerrlin1, nralphainrangelow);
+         fprintf(stderr, "block err lin high %d, nr %d\n", blockerrlin2, nralphainrangehigh);
+#endif
+         /* again shouldn't really happen often... */
+         if (alphatest[0] < 0) {
+            alphatest[0] = 0;
+         }
+         alphatest[1] = alphatest[1] + (blockerrlin2 / nralphainrangehigh);
+         if (alphatest[1] > 255) {
+            alphatest[1] = 255;
+         }
+
+         alphablockerror3 = 0;
+         for (aindex = 0; aindex < 5; aindex++) {
+         /* don't forget here is always rounded down */
+            acutValues[aindex] = (alphatest[0] * (10 - (2*aindex + 1)) + alphatest[1] * (2*aindex + 1)) / 10;
+         }
+         for (j = 0; j < numypixels; j++) {
+            for (i = 0; i < numxpixels; i++) {
+                /* maybe it's overkill to have the most complicated calculation just for the error
+                  calculation which we only need to figure out if encoding1 or encoding2 is better... */
+               if (srccolors[j][i] <= alphatest[0] / 2) {
+                  alphaenc3[4*j + i] = 6;
+                  alphadist = srccolors[j][i];
+               }
+               else if (srccolors[j][i] > ((255 + alphatest[1]) / 2)) {
+                  alphaenc3[4*j + i] = 7;
+                  alphadist = 255 - srccolors[j][i];
+               }
+               else if (srccolors[j][i] <= acutValues[0]) {
+                  alphaenc3[4*j + i] = 0;
+                  alphadist = srccolors[j][i] - alphatest[0];
+               }
+               else if (srccolors[j][i] <= acutValues[1]) {
+                 alphaenc3[4*j + i] = 2;
+                 alphadist = srccolors[j][i] - (alphatest[0] * 4 + alphatest[1] * 1) / 5;
+               }
+               else if (srccolors[j][i] <= acutValues[2]) {
+                  alphaenc3[4*j + i] = 3;
+                  alphadist = srccolors[j][i] - (alphatest[0] * 3 + alphatest[1] * 2) / 5;
+               }
+               else if (srccolors[j][i] <= acutValues[3]) {
+                  alphaenc3[4*j + i] = 4;
+                  alphadist = srccolors[j][i] - (alphatest[0] * 2 + alphatest[1] * 3) / 5;
+               }
+               else if (srccolors[j][i] <= acutValues[4]) {
+                  alphaenc3[4*j + i] = 5;
+                  alphadist = srccolors[j][i] - (alphatest[0] * 1 + alphatest[1] * 4) / 5;
+               }
+               else {
+                  alphaenc3[4*j + i] = 1;
+                  alphadist = srccolors[j][i] - alphatest[1];
+               }
+               alphablockerror3 += alphadist * alphadist;
+            }
+         }
+      }
+   }
+  /* write the alpha values and encoding back. */
+   if ((alphablockerror1 <= alphablockerror2) && (alphablockerror1 <= alphablockerror3)) {
+#if RGTC_DEBUG
+      if (alphablockerror1 > 96) fprintf(stderr, "enc1 used, error %d\n", alphablockerror1);
+#endif
+      write_rgtc_encoded_channel_s( blkaddr, alphause[1], alphause[0], alphaenc1 );
+   }
+   else if (alphablockerror2 <= alphablockerror3) {
+#if RGTC_DEBUG
+      if (alphablockerror2 > 96) fprintf(stderr, "enc2 used, error %d\n", alphablockerror2);
+#endif
+      write_rgtc_encoded_channel_s( blkaddr, alphabase[0], alphabase[1], alphaenc2 );
+   }
+   else {
+#if RGTC_DEBUG
+      fprintf(stderr, "enc3 used, error %d\n", alphablockerror3);
+#endif
+      write_rgtc_encoded_channel_s( blkaddr, (GLubyte)alphatest[0], (GLubyte)alphatest[1], alphaenc3 );
+   }
+}
diff --git a/mesalib/src/mesa/main/texcompress_rgtc.h b/mesalib/src/mesa/main/texcompress_rgtc.h
new file mode 100644
index 000000000..424edc458
--- /dev/null
+++ b/mesalib/src/mesa/main/texcompress_rgtc.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef TEXCOMPRESS_RGTC_H
+#define TEXCOMPRESS_RGTC_H
+
+#include "glheader.h"
+#include "mfeatures.h"
+#include "texstore.h"
+
+struct gl_texture_image;
+
+extern GLboolean
+_mesa_texstore_red_rgtc1(TEXSTORE_PARAMS);
+
+extern GLboolean
+_mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS);
+
+extern GLboolean
+_mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS);
+
+extern GLboolean
+_mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS);
+
+extern void
+_mesa_fetch_texel_2d_f_red_rgtc1(const struct gl_texture_image *texImage,
+				 GLint i, GLint j, GLint k, GLfloat *texel);
+
+extern void
+_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct gl_texture_image *texImage,
+					GLint i, GLint j, GLint k, GLfloat *texel);
+
+extern void
+_mesa_fetch_texel_2d_f_rg_rgtc2(const struct gl_texture_image *texImage,
+				 GLint i, GLint j, GLint k, GLfloat *texel);
+
+extern void
+_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct gl_texture_image *texImage,
+				       GLint i, GLint j, GLint k, GLfloat *texel);
+#endif
diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c
index 1e7ea9480..8666076ab 100644
--- a/mesalib/src/mesa/main/texfetch.c
+++ b/mesalib/src/mesa/main/texfetch.c
@@ -38,6 +38,7 @@
 #include "texcompress.h"

 #include "texcompress_fxt1.h"

 #include "texcompress_s3tc.h"

+#include "texcompress_rgtc.h"

 #include "texfetch.h"

 #include "teximage.h"

 

@@ -756,7 +757,35 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       fetch_texel_2d_rgba_16,

       fetch_texel_3d_rgba_16,

       store_texel_rgba_16

-   }

+   },

+   {

+      MESA_FORMAT_RED_RGTC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_red_rgtc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_RED_RGTC1,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_red_rgtc1,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_RG_RGTC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_rg_rgtc2,

+      NULL,

+      NULL

+   },

+   {

+      MESA_FORMAT_SIGNED_RG_RGTC2,

+      NULL,

+      _mesa_fetch_texel_2d_f_signed_rg_rgtc2,

+      NULL,

+      NULL

+   },

 };

 

 

diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index 2542cea85..8040fac7d 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -1,608 +1,627 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.7
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008-2009 VMware, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/**
- * \file texformat.c
- * Texture formats.
- *
- * \author Gareth Hughes
- * \author Brian Paul
- */
-
-
-#include "context.h"
-#include "mfeatures.h"
-#include "mtypes.h"
-#include "texcompress.h"
-#include "texformat.h"
-
-#define RETURN_IF_SUPPORTED(f) do {		\
-   if (ctx->TextureFormatSupported[f])		\
-      return f;					\
-} while (0)
-
-/**
- * Choose an appropriate texture format given the format, type and
- * internalFormat parameters passed to glTexImage().
- *
- * \param ctx  the GL context.
- * \param internalFormat  user's prefered internal texture format.
- * \param format  incoming image pixel format.
- * \param type  incoming image data type.
- *
- * \return a pointer to a gl_texture_format object which describes the
- * choosen texture format, or NULL on failure.
- * 
- * This is called via dd_function_table::ChooseTextureFormat.  Hardware drivers
- * will typically override this function with a specialized version.
- */
-gl_format
-_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
-                         GLenum format, GLenum type )
-{
-   (void) format;
-   (void) type;
-
-   switch (internalFormat) {
-      /* shallow RGBA formats */
-      case 4:
-      case GL_RGBA:
-	 if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
-	 } else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
-	 }
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      case GL_RGBA8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_RGB5_A1:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
-	 break;
-      case GL_RGBA2:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444_REV); /* just to test another format*/
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
-	 break;
-      case GL_RGBA4:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
-	 break;
-
-      /* deep RGBA formats */
-      case GL_RGB10_A2:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_RGBA12:
-      case GL_RGBA16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      /* shallow RGB formats */
-      case 3:
-      case GL_RGB:
-      case GL_RGB8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_R3_G3_B2:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB332);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_RGB4:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
-	 break;
-      case GL_RGB5:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
-	 break;
-
-      /* deep RGB formats */
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      /* Alpha formats */
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
-	 break;
-
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
-	 break;
-
-      /* Luminance formats */
-      case 1:
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
-	 break;
-
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
-	 break;
-
-      /* Luminance/Alpha formats */
-      case GL_LUMINANCE4_ALPHA4:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL44);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-
-      case 2:
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL1616);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
-	 break;
-
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
-	 break;
-
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-      case GL_COLOR_INDEX8_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_CI8);
-	 break;
-
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.ARB_depth_texture) {
-      switch (internalFormat) {
-         case GL_DEPTH_COMPONENT:
-         case GL_DEPTH_COMPONENT24:
-         case GL_DEPTH_COMPONENT32:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-	    break;
-         case GL_DEPTH_COMPONENT16:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   switch (internalFormat) {
-      case GL_COMPRESSED_ALPHA_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
-	 break;
-      case GL_COMPRESSED_LUMINANCE_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
-	 break;
-      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-      case GL_COMPRESSED_INTENSITY_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
-	 break;
-      case GL_COMPRESSED_RGB_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      case GL_COMPRESSED_RGBA_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.MESA_ycbcr_texture) {
-      if (internalFormat == GL_YCBCR_MESA) {
-         if (type == GL_UNSIGNED_SHORT_8_8_MESA)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);
-         else
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);
-      }
-   }
-
-#if FEATURE_texture_fxt1
-   if (ctx->Extensions.TDFX_texture_compression_FXT1) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_FXT1_3DFX:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
-	 break;
-         case GL_COMPRESSED_RGBA_FXT1_3DFX:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
-	 break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif
-
-#if FEATURE_texture_s3tc
-   if (ctx->Extensions.EXT_texture_compression_s3tc) {
-      switch (internalFormat) {
-         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-	    break;
-         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT1);
-	    break;
-         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);
-	    break;
-         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT5);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.S3_s3tc) {
-      switch (internalFormat) {
-         case GL_RGB_S3TC:
-         case GL_RGB4_S3TC:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-	    break;
-         case GL_RGBA_S3TC:
-         case GL_RGBA4_S3TC:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif
-
-   if (ctx->Extensions.ARB_texture_float) {
-      switch (internalFormat) {
-         case GL_ALPHA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
-	    break;
-         case GL_ALPHA32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);
-	    break;
-         case GL_LUMINANCE16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);
-	    break;
-         case GL_LUMINANCE32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);
-	    break;
-         case GL_LUMINANCE_ALPHA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);
-	    break;
-         case GL_LUMINANCE_ALPHA32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);
-	    break;
-         case GL_INTENSITY16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
-	    break;
-         case GL_INTENSITY32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);
-	    break;
-         case GL_RGB16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
-	    break;
-         case GL_RGB32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);
-	    break;
-         case GL_RGBA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	    break;
-         case GL_RGBA32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_packed_depth_stencil) {
-      switch (internalFormat) {
-         case GL_DEPTH_STENCIL_EXT:
-         case GL_DEPTH24_STENCIL8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ATI_envmap_bumpmap) {
-      switch (internalFormat) {
-         case GL_DUDV_ATI:
-         case GL_DU8DV8_ATI:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.MESA_texture_signed_rgba) {
-      switch (internalFormat) {
-         case GL_RGBA_SNORM:
-         case GL_RGBA8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->VersionMajor * 10 + ctx->VersionMinor >= 31) {
-      switch (internalFormat) {
-         case GL_RED_SNORM:
-         case GL_R8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);
-	    break;
-         case GL_RG_SNORM:
-         case GL_RG8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88);
-	    break;
-         case GL_RGB_SNORM:
-         case GL_RGB8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
-	    break;
-         case GL_RGBA_SNORM:
-         case GL_RGBA8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    break;
-         case GL_R16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R_16);
-	    break;
-         case GL_RG16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_16);
-	    break;
-         case GL_RGB16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);
-	    break;
-         case GL_RGBA16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-	    break;
-         default:
-            ; /* fall-through */
-      }
-   }
-
-#if FEATURE_EXT_texture_sRGB
-   if (ctx->Extensions.EXT_texture_sRGB) {
-      switch (internalFormat) {
-         case GL_SRGB_EXT:
-         case GL_SRGB8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SRGB_ALPHA_EXT:
-         case GL_SRGB8_ALPHA8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SLUMINANCE_EXT:
-         case GL_SLUMINANCE8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SLUMINANCE_ALPHA_EXT:
-         case GL_SLUMINANCE8_ALPHA8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SLUMINANCE_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SRGB_EXT:
-#if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
-#endif
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SRGB_ALPHA_EXT:
-#if FEATURE_texture_s3tc
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */
-#endif
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-#if FEATURE_texture_s3tc
-         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT1);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-            break;
-#endif
-         default:
-            ; /* fallthrough */
-      }
-   }
-#endif /* FEATURE_EXT_texture_sRGB */
-
-   if (ctx->Extensions.EXT_texture_integer) {
-      switch (internalFormat) {
-      case GL_RGBA32UI_EXT:
-      case GL_RGB32UI_EXT:
-      case GL_ALPHA32UI_EXT:
-      case GL_INTENSITY32UI_EXT:
-      case GL_LUMINANCE32UI_EXT:
-      case GL_LUMINANCE_ALPHA32UI_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
-	 break;
-      case GL_RGBA16UI_EXT:
-      case GL_RGB16UI_EXT:
-      case GL_ALPHA16UI_EXT:
-      case GL_INTENSITY16UI_EXT:
-      case GL_LUMINANCE16UI_EXT:
-      case GL_LUMINANCE_ALPHA16UI_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
-	 break;
-      case GL_RGBA8UI_EXT:
-      case GL_RGB8UI_EXT:
-      case GL_ALPHA8UI_EXT:
-      case GL_INTENSITY8UI_EXT:
-      case GL_LUMINANCE8UI_EXT:
-      case GL_LUMINANCE_ALPHA8UI_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
-	 break;
-      case GL_RGBA32I_EXT:
-      case GL_RGB32I_EXT:
-      case GL_ALPHA32I_EXT:
-      case GL_INTENSITY32I_EXT:
-      case GL_LUMINANCE32I_EXT:
-      case GL_LUMINANCE_ALPHA32I_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
-	 break;
-      case GL_RGBA16I_EXT:
-      case GL_RGB16I_EXT:
-      case GL_ALPHA16I_EXT:
-      case GL_INTENSITY16I_EXT:
-      case GL_LUMINANCE16I_EXT:
-      case GL_LUMINANCE_ALPHA16I_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
-	 break;
-      case GL_RGBA8I_EXT:
-      case GL_RGB8I_EXT:
-      case GL_ALPHA8I_EXT:
-      case GL_INTENSITY8I_EXT:
-      case GL_LUMINANCE8I_EXT:
-      case GL_LUMINANCE_ALPHA8I_EXT:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
-	 break;
-      }
-   }
-
-   if (ctx->Extensions.ARB_texture_rg) {
-      switch (internalFormat) {
-      case GL_R8:
-      case GL_RED:
-      case GL_COMPRESSED_RED:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R8);
-	 break;
-
-      case GL_R16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R16);
-	 break;
-
-      case GL_RG:
-      case GL_RG8:
-      case GL_COMPRESSED_RG:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);
-	 break;
-
-      case GL_RG16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG1616);
-	 break;
-
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_format_BGRA8888) {
-      switch (internalFormat) {
-      case GL_BGRA:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
-   return MESA_FORMAT_NONE;
-}
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.7

+ *

+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

+ * Copyright (c) 2008-2009 VMware, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

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

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ */

+

+

+/**

+ * \file texformat.c

+ * Texture formats.

+ *

+ * \author Gareth Hughes

+ * \author Brian Paul

+ */

+

+

+#include "context.h"

+#include "mfeatures.h"

+#include "mtypes.h"

+#include "texcompress.h"

+#include "texformat.h"

+

+#define RETURN_IF_SUPPORTED(f) do {		\

+   if (ctx->TextureFormatSupported[f])		\

+      return f;					\

+} while (0)

+

+/**

+ * Choose an appropriate texture format given the format, type and

+ * internalFormat parameters passed to glTexImage().

+ *

+ * \param ctx  the GL context.

+ * \param internalFormat  user's prefered internal texture format.

+ * \param format  incoming image pixel format.

+ * \param type  incoming image data type.

+ *

+ * \return a pointer to a gl_texture_format object which describes the

+ * choosen texture format, or NULL on failure.

+ * 

+ * This is called via dd_function_table::ChooseTextureFormat.  Hardware drivers

+ * will typically override this function with a specialized version.

+ */

+gl_format

+_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,

+                         GLenum format, GLenum type )

+{

+   (void) format;

+   (void) type;

+

+   switch (internalFormat) {

+      /* shallow RGBA formats */

+      case 4:

+      case GL_RGBA:

+	 if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 } else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);

+	 }

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      case GL_RGBA8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_RGB5_A1:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);

+	 break;

+      case GL_RGBA2:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444_REV); /* just to test another format*/

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 break;

+      case GL_RGBA4:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 break;

+

+      /* deep RGBA formats */

+      case GL_RGB10_A2:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_RGBA12:

+      case GL_RGBA16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      /* shallow RGB formats */

+      case 3:

+      case GL_RGB:

+      case GL_RGB8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_R3_G3_B2:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB332);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_RGB4:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);

+	 break;

+      case GL_RGB5:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);

+	 break;

+

+      /* deep RGB formats */

+      case GL_RGB10:

+      case GL_RGB12:

+      case GL_RGB16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      /* Alpha formats */

+      case GL_ALPHA:

+      case GL_ALPHA4:

+      case GL_ALPHA8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

+

+      case GL_ALPHA12:

+      case GL_ALPHA16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

+

+      /* Luminance formats */

+      case 1:

+      case GL_LUMINANCE:

+      case GL_LUMINANCE4:

+      case GL_LUMINANCE8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

+

+      case GL_LUMINANCE12:

+      case GL_LUMINANCE16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

+

+      /* Luminance/Alpha formats */

+      case GL_LUMINANCE4_ALPHA4:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL44);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+

+      case 2:

+      case GL_LUMINANCE_ALPHA:

+      case GL_LUMINANCE6_ALPHA2:

+      case GL_LUMINANCE8_ALPHA8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+

+      case GL_LUMINANCE12_ALPHA4:

+      case GL_LUMINANCE12_ALPHA12:

+      case GL_LUMINANCE16_ALPHA16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL1616);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+

+      case GL_INTENSITY:

+      case GL_INTENSITY4:

+      case GL_INTENSITY8:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

+

+      case GL_INTENSITY12:

+      case GL_INTENSITY16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

+

+      case GL_COLOR_INDEX:

+      case GL_COLOR_INDEX1_EXT:

+      case GL_COLOR_INDEX2_EXT:

+      case GL_COLOR_INDEX4_EXT:

+      case GL_COLOR_INDEX12_EXT:

+      case GL_COLOR_INDEX16_EXT:

+      case GL_COLOR_INDEX8_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_CI8);

+	 break;

+

+      default:

+         ; /* fallthrough */

+   }

+

+   if (ctx->Extensions.ARB_depth_texture) {

+      switch (internalFormat) {

+         case GL_DEPTH_COMPONENT:

+         case GL_DEPTH_COMPONENT24:

+         case GL_DEPTH_COMPONENT32:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+	    break;

+         case GL_DEPTH_COMPONENT16:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   switch (internalFormat) {

+      case GL_COMPRESSED_ALPHA_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

+      case GL_COMPRESSED_LUMINANCE_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

+      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

+      case GL_COMPRESSED_INTENSITY_ARB:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

+      case GL_COMPRESSED_RGB_ARB:

+         if (ctx->Extensions.EXT_texture_compression_s3tc ||

+             ctx->Extensions.S3_s3tc)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+         if (ctx->Extensions.TDFX_texture_compression_FXT1)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      case GL_COMPRESSED_RGBA_ARB:

+         if (ctx->Extensions.EXT_texture_compression_s3tc ||

+             ctx->Extensions.S3_s3tc)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */

+         if (ctx->Extensions.TDFX_texture_compression_FXT1)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+      default:

+         ; /* fallthrough */

+   }

+

+   if (ctx->Extensions.MESA_ycbcr_texture) {

+      if (internalFormat == GL_YCBCR_MESA) {

+         if (type == GL_UNSIGNED_SHORT_8_8_MESA)

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);

+         else

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);

+      }

+   }

+

+#if FEATURE_texture_fxt1

+   if (ctx->Extensions.TDFX_texture_compression_FXT1) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_FXT1_3DFX:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);

+	 break;

+         case GL_COMPRESSED_RGBA_FXT1_3DFX:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);

+	 break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif

+

+#if FEATURE_texture_s3tc

+   if (ctx->Extensions.EXT_texture_compression_s3tc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+	    break;

+         case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT1);

+	    break;

+         case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);

+	    break;

+         case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT5);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.S3_s3tc) {

+      switch (internalFormat) {

+         case GL_RGB_S3TC:

+         case GL_RGB4_S3TC:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+	    break;

+         case GL_RGBA_S3TC:

+         case GL_RGBA4_S3TC:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif

+

+   if (ctx->Extensions.ARB_texture_float) {

+      switch (internalFormat) {

+         case GL_ALPHA16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);

+	    break;

+         case GL_ALPHA32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);

+	    break;

+         case GL_LUMINANCE16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);

+	    break;

+         case GL_LUMINANCE32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);

+	    break;

+         case GL_LUMINANCE_ALPHA16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);

+	    break;

+         case GL_LUMINANCE_ALPHA32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);

+	    break;

+         case GL_INTENSITY16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);

+	    break;

+         case GL_INTENSITY32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);

+	    break;

+         case GL_RGB16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);

+	    break;

+         case GL_RGB32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);

+	    break;

+         case GL_RGBA16F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);

+	    break;

+         case GL_RGBA32F_ARB:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_packed_depth_stencil) {

+      switch (internalFormat) {

+         case GL_DEPTH_STENCIL_EXT:

+         case GL_DEPTH24_STENCIL8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ATI_envmap_bumpmap) {

+      switch (internalFormat) {

+         case GL_DUDV_ATI:

+         case GL_DU8DV8_ATI:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.MESA_texture_signed_rgba) {

+      switch (internalFormat) {

+         case GL_RGBA_SNORM:

+         case GL_RGBA8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   if (ctx->VersionMajor * 10 + ctx->VersionMinor >= 31) {

+      switch (internalFormat) {

+         case GL_RED_SNORM:

+         case GL_R8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);

+	    break;

+         case GL_RG_SNORM:

+         case GL_RG8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88);

+	    break;

+         case GL_RGB_SNORM:

+         case GL_RGB8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);

+	    break;

+         case GL_RGBA_SNORM:

+         case GL_RGBA8_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    break;

+         case GL_R16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R_16);

+	    break;

+         case GL_RG16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_16);

+	    break;

+         case GL_RGB16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);

+	    break;

+         case GL_RGBA16_SNORM:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);

+	    break;

+         default:

+            ; /* fall-through */

+      }

+   }

+

+#if FEATURE_EXT_texture_sRGB

+   if (ctx->Extensions.EXT_texture_sRGB) {

+      switch (internalFormat) {

+         case GL_SRGB_EXT:

+         case GL_SRGB8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_SRGB_ALPHA_EXT:

+         case GL_SRGB8_ALPHA8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_SLUMINANCE_EXT:

+         case GL_SLUMINANCE8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_SLUMINANCE_ALPHA_EXT:

+         case GL_SLUMINANCE8_ALPHA8_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SLUMINANCE_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SRGB_EXT:

+#if FEATURE_texture_s3tc

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);

+#endif

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+         case GL_COMPRESSED_SRGB_ALPHA_EXT:

+#if FEATURE_texture_s3tc

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */

+#endif

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

+#if FEATURE_texture_s3tc

+         case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT1);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+         case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

+            if (ctx->Extensions.EXT_texture_compression_s3tc)

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+            break;

+#endif

+         default:

+            ; /* fallthrough */

+      }

+   }

+#endif /* FEATURE_EXT_texture_sRGB */

+

+   if (ctx->Extensions.EXT_texture_integer) {

+      switch (internalFormat) {

+      case GL_RGBA32UI_EXT:

+      case GL_RGB32UI_EXT:

+      case GL_ALPHA32UI_EXT:

+      case GL_INTENSITY32UI_EXT:

+      case GL_LUMINANCE32UI_EXT:

+      case GL_LUMINANCE_ALPHA32UI_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);

+	 break;

+      case GL_RGBA16UI_EXT:

+      case GL_RGB16UI_EXT:

+      case GL_ALPHA16UI_EXT:

+      case GL_INTENSITY16UI_EXT:

+      case GL_LUMINANCE16UI_EXT:

+      case GL_LUMINANCE_ALPHA16UI_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);

+	 break;

+      case GL_RGBA8UI_EXT:

+      case GL_RGB8UI_EXT:

+      case GL_ALPHA8UI_EXT:

+      case GL_INTENSITY8UI_EXT:

+      case GL_LUMINANCE8UI_EXT:

+      case GL_LUMINANCE_ALPHA8UI_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);

+	 break;

+      case GL_RGBA32I_EXT:

+      case GL_RGB32I_EXT:

+      case GL_ALPHA32I_EXT:

+      case GL_INTENSITY32I_EXT:

+      case GL_LUMINANCE32I_EXT:

+      case GL_LUMINANCE_ALPHA32I_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);

+	 break;

+      case GL_RGBA16I_EXT:

+      case GL_RGB16I_EXT:

+      case GL_ALPHA16I_EXT:

+      case GL_INTENSITY16I_EXT:

+      case GL_LUMINANCE16I_EXT:

+      case GL_LUMINANCE_ALPHA16I_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);

+	 break;

+      case GL_RGBA8I_EXT:

+      case GL_RGB8I_EXT:

+      case GL_ALPHA8I_EXT:

+      case GL_INTENSITY8I_EXT:

+      case GL_LUMINANCE8I_EXT:

+      case GL_LUMINANCE_ALPHA8I_EXT:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);

+	 break;

+      }

+   }

+

+   if (ctx->Extensions.ARB_texture_rg) {

+      switch (internalFormat) {

+      case GL_R8:

+      case GL_RED:

+      case GL_COMPRESSED_RED:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_R8);

+	 break;

+

+      case GL_R16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_R16);

+	 break;

+

+      case GL_RG:

+      case GL_RG8:

+      case GL_COMPRESSED_RG:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);

+	 break;

+

+      case GL_RG16:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG1616);

+	 break;

+

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.EXT_texture_format_BGRA8888) {

+      switch (internalFormat) {

+      case GL_BGRA:

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

+      default:

+         ; /* fallthrough */

+      }

+   }

+

+   if (ctx->Extensions.ARB_texture_compression_rgtc) {

+      switch (internalFormat) {

+         case GL_COMPRESSED_RED_RGTC1:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);

+	    break;

+         case GL_COMPRESSED_SIGNED_RED_RGTC1:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RED_RGTC1);

+	    break;

+         case GL_COMPRESSED_RG_RGTC2:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);

+	    break;

+         case GL_COMPRESSED_SIGNED_RG_RGTC2:

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_RGTC2);

+	    break;

+         default:

+            ; /* fallthrough */

+      }

+   }

+

+   _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");

+   return MESA_FORMAT_NONE;

+}

+

diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 1947d32e6..60ded5852 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -65,6 +65,7 @@
 #include "pack.h"

 #include "texcompress.h"

 #include "texcompress_fxt1.h"

+#include "texcompress_rgtc.h"

 #include "texcompress_s3tc.h"

 #include "teximage.h"

 #include "texstore.h"

@@ -310,15 +311,15 @@ compute_component_mapping(GLenum inFormat, GLenum outFormat,
  * \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 *

+_mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,

+			    GLenum logicalBaseFormat,

+			    GLenum textureBaseFormat,

+			    GLint srcWidth, GLint srcHeight, GLint srcDepth,

+			    GLenum srcFormat, GLenum srcType,

+			    const GLvoid *srcAddr,

+			    const struct gl_pixelstore_attrib *srcPacking,

+			    GLbitfield transferOps)

 {

    GLfloat *tempImage;

    const GLint components = _mesa_components_in_format(logicalBaseFormat);

@@ -2065,7 +2066,7 @@ _mesa_texstore_argb2101010(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -2317,7 +2318,7 @@ _mesa_texstore_unorm1616(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -2394,7 +2395,7 @@ _mesa_texstore_unorm16(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -2452,7 +2453,7 @@ _mesa_texstore_rgba_16(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -2519,7 +2520,7 @@ _mesa_texstore_signed_rgba_16(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -2901,7 +2902,7 @@ _mesa_texstore_signed_r8(TEXSTORE_PARAMS)
    /* XXX look at adding optimized paths */

    {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -2946,7 +2947,7 @@ _mesa_texstore_signed_rg88(TEXSTORE_PARAMS)
    /* XXX look at adding optimized paths */

    {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -2991,7 +2992,7 @@ _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
 

    {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -3104,7 +3105,7 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -3413,7 +3414,7 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -3483,7 +3484,7 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -3549,7 +3550,7 @@ _mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -3614,7 +3615,7 @@ _mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -3679,7 +3680,7 @@ _mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
    }

    else {

       /* general path */

-      const GLfloat *tempImage = make_temp_float_image(ctx, dims,

+      const GLfloat *tempImage = _mesa_make_temp_float_image(ctx, dims,

                                                  baseInternalFormat,

                                                  baseFormat,

                                                  srcWidth, srcHeight, srcDepth,

@@ -4128,7 +4129,12 @@ texstore_funcs[MESA_FORMAT_COUNT] =
    { 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 }

+   { MESA_FORMAT_RGBA_16, _mesa_texstore_rgba_16 },

+

+   { MESA_FORMAT_RED_RGTC1, _mesa_texstore_red_rgtc1 },

+   { MESA_FORMAT_SIGNED_RED_RGTC1, _mesa_texstore_signed_red_rgtc1 },

+   { MESA_FORMAT_RG_RGTC2, _mesa_texstore_rg_rgtc2 },

+   { MESA_FORMAT_SIGNED_RG_RGTC2, _mesa_texstore_signed_rg_rgtc2 }

 };

 

 

diff --git a/mesalib/src/mesa/main/texstore.h b/mesalib/src/mesa/main/texstore.h
index 8640a23a7..35339da77 100644
--- a/mesalib/src/mesa/main/texstore.h
+++ b/mesalib/src/mesa/main/texstore.h
@@ -81,6 +81,15 @@ _mesa_make_temp_chan_image(struct gl_context *ctx, GLuint dims,
                            const GLvoid *srcAddr,

                            const struct gl_pixelstore_attrib *srcPacking);

 

+GLfloat *

+_mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,

+			    GLenum logicalBaseFormat,

+			    GLenum textureBaseFormat,

+			    GLint srcWidth, GLint srcHeight, GLint srcDepth,

+			    GLenum srcFormat, GLenum srcType,

+			    const GLvoid *srcAddr,

+			    const struct gl_pixelstore_attrib *srcPacking,

+			    GLbitfield transferOps);

 

 extern void

 _mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level,

diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index b10881c55..b71194880 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -78,6 +78,7 @@ MAIN_SOURCES = \
 	main/stencil.c \

 	main/syncobj.c \

 	main/texcompress.c \

+	main/texcompress_rgtc.c \

 	main/texcompress_s3tc.c \

 	main/texcompress_fxt1.c \

 	main/texenv.c \

diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index 16cd92c6b..28186378f 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -579,6 +579,7 @@ st_validate_varrays(struct gl_context *ctx,
    if (is_interleaved_arrays(vp, vpv, arrays)) {

       setup_interleaved_attribs(ctx, vp, vpv, arrays, vbuffer, velements,

                                 max_index);

+

       num_vbuffers = 1;

       num_velements = vpv->num_inputs;

       if (num_velements == 0)

@@ -645,6 +646,7 @@ st_draw_vbo(struct gl_context *ctx,
       for (i = 0; i < nr_prims; i++) {

          min_index = MIN2(min_index, prims[i].start);

          max_index = MAX2(max_index, prims[i].start + prims[i].count - 1);

+         max_index = MAX2(max_index, prims[i].num_instances);

       }

    }

 

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index b1ede1c8b..71c6c9252 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -416,6 +416,22 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.S3_s3tc = GL_TRUE;

    }

 

+   if (screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC1_SNORM,

+				   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_UNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0) &&

+       screen->is_format_supported(screen, PIPE_FORMAT_RGTC2_SNORM,

+                                   PIPE_TEXTURE_2D, 0,

+                                   PIPE_BIND_SAMPLER_VIEW, 0)

+       ) {

+     ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;

+   }

+

    /* ycbcr support */

    if (screen->is_format_supported(screen, PIPE_FORMAT_UYVY, 

                                    PIPE_TEXTURE_2D, 0,

diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 3620d0cb6..f004ecf03 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -241,6 +241,14 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat)
    case MESA_FORMAT_RGBA_UINT32:

       return PIPE_FORMAT_R32G32B32A32_USCALED;

 

+   case MESA_FORMAT_RED_RGTC1:

+      return PIPE_FORMAT_RGTC1_UNORM;

+   case MESA_FORMAT_SIGNED_RED_RGTC1:

+      return PIPE_FORMAT_RGTC1_SNORM;

+   case MESA_FORMAT_RG_RGTC2:

+      return PIPE_FORMAT_RGTC2_UNORM;

+   case MESA_FORMAT_SIGNED_RG_RGTC2:

+      return PIPE_FORMAT_RGTC2_SNORM;

    default:

       assert(0);

       return PIPE_FORMAT_NONE;

@@ -380,6 +388,15 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_R32G32B32A32_USCALED:

       return MESA_FORMAT_RGBA_UINT32;

 

+   case PIPE_FORMAT_RGTC1_UNORM:

+      return MESA_FORMAT_RED_RGTC1;

+   case PIPE_FORMAT_RGTC1_SNORM:

+      return MESA_FORMAT_SIGNED_RED_RGTC1;

+   case PIPE_FORMAT_RGTC2_UNORM:

+      return MESA_FORMAT_RG_RGTC2;

+   case PIPE_FORMAT_RGTC2_SNORM:

+      return MESA_FORMAT_SIGNED_RG_RGTC2;

+

    default:

       assert(0);

       return MESA_FORMAT_NONE;

diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 5c68fd78c..bf0bfd6df 100644
--- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1,1249 +1,1249 @@
-/**************************************************************************
- * 
- * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-/*
- * \author
- * Michal Krol,
- * Keith Whitwell
- */
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_context.h"
-#include "pipe/p_screen.h"
-#include "pipe/p_shader_tokens.h"
-#include "pipe/p_state.h"
-#include "tgsi/tgsi_ureg.h"
-#include "st_mesa_to_tgsi.h"
-#include "st_context.h"
-#include "program/prog_instruction.h"
-#include "program/prog_parameter.h"
-#include "util/u_debug.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-
-
-#define PROGRAM_ANY_CONST ((1 << PROGRAM_LOCAL_PARAM) |  \
-                           (1 << PROGRAM_ENV_PARAM) |    \
-                           (1 << PROGRAM_STATE_VAR) |    \
-                           (1 << PROGRAM_NAMED_PARAM) |  \
-                           (1 << PROGRAM_CONSTANT) |     \
-                           (1 << PROGRAM_UNIFORM))
-
-
-struct label {
-   unsigned branch_target;
-   unsigned token;
-};
-
-
-/**
- * Intermediate state used during shader translation.
- */
-struct st_translate {
-   struct ureg_program *ureg;
-
-   struct ureg_dst temps[MAX_PROGRAM_TEMPS];
-   struct ureg_src *constants;
-   struct ureg_dst outputs[PIPE_MAX_SHADER_OUTPUTS];
-   struct ureg_src inputs[PIPE_MAX_SHADER_INPUTS];
-   struct ureg_dst address[1];
-   struct ureg_src samplers[PIPE_MAX_SAMPLERS];
-   struct ureg_src systemValues[SYSTEM_VALUE_MAX];
-
-   /* Extra info for handling point size clamping in vertex shader */
-   struct ureg_dst pointSizeResult; /**< Actual point size output register */
-   struct ureg_src pointSizeConst;  /**< Point size range constant register */
-   GLint pointSizeOutIndex;         /**< Temp point size output register */
-   GLboolean prevInstWrotePointSize;
-
-   const GLuint *inputMapping;
-   const GLuint *outputMapping;
-
-   /* For every instruction that contains a label (eg CALL), keep
-    * details so that we can go back afterwards and emit the correct
-    * tgsi instruction number for each label.
-    */
-   struct label *labels;
-   unsigned labels_size;
-   unsigned labels_count;
-
-   /* Keep a record of the tgsi instruction number that each mesa
-    * instruction starts at, will be used to fix up labels after
-    * translation.
-    */
-   unsigned *insn;
-   unsigned insn_size;
-   unsigned insn_count;
-
-   unsigned procType;  /**< TGSI_PROCESSOR_VERTEX/FRAGMENT */
-
-   boolean error;
-};
-
-
-/** Map Mesa's SYSTEM_VALUE_x to TGSI_SEMANTIC_x */
-static unsigned mesa_sysval_to_semantic[SYSTEM_VALUE_MAX] = {
-   TGSI_SEMANTIC_FACE,
-   TGSI_SEMANTIC_INSTANCEID
-};
-
-
-/**
- * Make note of a branch to a label in the TGSI code.
- * After we've emitted all instructions, we'll go over the list
- * of labels built here and patch the TGSI code with the actual
- * location of each label.
- */
-static unsigned *get_label( struct st_translate *t,
-                            unsigned branch_target )
-{
-   unsigned i;
-
-   if (t->labels_count + 1 >= t->labels_size) {
-      unsigned old_size = t->labels_size;
-      t->labels_size = 1 << (util_logbase2(t->labels_size) + 1);
-      t->labels = REALLOC( t->labels, 
-                           old_size * sizeof t->labels[0], 
-                           t->labels_size * sizeof t->labels[0] );
-      if (t->labels == NULL) {
-         static unsigned dummy;
-         t->error = TRUE;
-         return &dummy;
-      }
-   }
-
-   i = t->labels_count++;
-   t->labels[i].branch_target = branch_target;
-   return &t->labels[i].token;
-}
-
-
-/**
- * Called prior to emitting the TGSI code for each Mesa instruction.
- * Allocate additional space for instructions if needed.
- * Update the insn[] array so the next Mesa instruction points to
- * the next TGSI instruction.
- */
-static void set_insn_start( struct st_translate *t,
-                            unsigned start )
-{
-   if (t->insn_count + 1 >= t->insn_size) {
-      unsigned old_size = t->insn_size;
-      t->insn_size = 1 << (util_logbase2(t->insn_size) + 1);
-      t->insn = REALLOC( t->insn, 
-                         old_size * sizeof t->insn[0], 
-                         t->insn_size * sizeof t->insn[0] );
-      if (t->insn == NULL) {
-         t->error = TRUE;
-         return;
-      }
-   }
-
-   t->insn[t->insn_count++] = start;
-}
-
-
-/**
- * Map a Mesa dst register to a TGSI ureg_dst register.
- */
-static struct ureg_dst
-dst_register( struct st_translate *t,
-              gl_register_file file,
-              GLuint index )
-{
-   switch( file ) {
-   case PROGRAM_UNDEFINED:
-      return ureg_dst_undef();
-
-   case PROGRAM_TEMPORARY:
-      if (ureg_dst_is_undef(t->temps[index]))
-         t->temps[index] = ureg_DECL_temporary( t->ureg );
-
-      return t->temps[index];
-
-   case PROGRAM_OUTPUT:
-      if (t->procType == TGSI_PROCESSOR_VERTEX && index == VERT_RESULT_PSIZ)
-         t->prevInstWrotePointSize = GL_TRUE;
-
-      if (t->procType == TGSI_PROCESSOR_VERTEX)
-         assert(index < VERT_RESULT_MAX);
-      else if (t->procType == TGSI_PROCESSOR_FRAGMENT)
-         assert(index < FRAG_RESULT_MAX);
-      else
-         assert(index < GEOM_RESULT_MAX);
-
-      assert(t->outputMapping[index] < Elements(t->outputs));
-
-      return t->outputs[t->outputMapping[index]];
-
-   case PROGRAM_ADDRESS:
-      return t->address[index];
-
-   default:
-      debug_assert( 0 );
-      return ureg_dst_undef();
-   }
-}
-
-
-/**
- * Map a Mesa src register to a TGSI ureg_src register.
- */
-static struct ureg_src
-src_register( struct st_translate *t,
-              gl_register_file file,
-              GLint index )
-{
-   switch( file ) {
-   case PROGRAM_UNDEFINED:
-      return ureg_src_undef();
-
-   case PROGRAM_TEMPORARY:
-      assert(index >= 0);
-      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]);
-
-   case PROGRAM_SYSTEM_VALUE:
-      assert(index < Elements(t->systemValues));
-      return t->systemValues[index];
-
-   default:
-      debug_assert( 0 );
-      return ureg_src_undef();
-   }
-}
-
-
-/**
- * Map mesa texture target to TGSI texture target.
- */
-static unsigned
-translate_texture_target( GLuint textarget,
-                          GLboolean shadow )
-{
-   if (shadow) {
-      switch( textarget ) {
-      case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_SHADOW1D;
-      case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_SHADOW2D;
-      case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_SHADOWRECT;
-      default: break;
-      }
-   }
-
-   switch( textarget ) {
-   case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_1D;
-   case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_2D;
-   case TEXTURE_3D_INDEX:   return TGSI_TEXTURE_3D;
-   case TEXTURE_CUBE_INDEX: return TGSI_TEXTURE_CUBE;
-   case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_RECT;
-   case TEXTURE_1D_ARRAY_INDEX:   return TGSI_TEXTURE_1D_ARRAY;
-   case TEXTURE_2D_ARRAY_INDEX:   return TGSI_TEXTURE_2D_ARRAY;
-   default:
-      debug_assert( 0 );
-      return TGSI_TEXTURE_1D;
-   }
-}
-
-
-/**
- * Create a TGSI ureg_dst register from a Mesa dest register.
- */
-static struct ureg_dst
-translate_dst( struct st_translate *t,
-               const struct prog_dst_register *DstReg,
-               boolean saturate )
-{
-   struct ureg_dst dst = dst_register( t, 
-                                       DstReg->File,
-                                       DstReg->Index );
-
-   dst = ureg_writemask( dst, 
-                         DstReg->WriteMask );
-   
-   if (saturate)
-      dst = ureg_saturate( dst );
-
-   if (DstReg->RelAddr)
-      dst = ureg_dst_indirect( dst, ureg_src(t->address[0]) );
-
-   return dst;
-}
-
-
-/**
- * Create a TGSI ureg_src register from a Mesa src register.
- */
-static struct ureg_src
-translate_src( struct st_translate *t,
-               const struct prog_src_register *SrcReg )
-{
-   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );
-
-   if (t->procType == TGSI_PROCESSOR_GEOMETRY && SrcReg->HasIndex2) {
-      src = src_register( t, SrcReg->File, SrcReg->Index2 );
-      if (SrcReg->RelAddr2)
-         src = ureg_src_dimension_indirect( src, ureg_src(t->address[0]),
-                                            SrcReg->Index);
-      else
-         src = ureg_src_dimension( src, SrcReg->Index);
-   }
-
-   src = ureg_swizzle( src,
-                       GET_SWZ( SrcReg->Swizzle, 0 ) & 0x3,
-                       GET_SWZ( SrcReg->Swizzle, 1 ) & 0x3,
-                       GET_SWZ( SrcReg->Swizzle, 2 ) & 0x3,
-                       GET_SWZ( SrcReg->Swizzle, 3 ) & 0x3);
-
-   if (SrcReg->Negate == NEGATE_XYZW)
-      src = ureg_negate(src);
-
-   if (SrcReg->Abs) 
-      src = ureg_abs(src);
-
-   if (SrcReg->RelAddr) {
-      src = ureg_src_indirect( src, ureg_src(t->address[0]));
-      if (SrcReg->File != PROGRAM_INPUT &&
-          SrcReg->File != PROGRAM_OUTPUT) {
-         /* If SrcReg->Index was negative, it was set to zero in
-          * src_register().  Reassign it now.  But don't do this
-          * for input/output regs since they get remapped while
-          * const buffers don't.
-          */
-         src.Index = SrcReg->Index;
-      }
-   }
-
-   return src;
-}
-
-
-static struct ureg_src swizzle_4v( struct ureg_src src,
-                                   const unsigned *swz )
-{
-   return ureg_swizzle( src, swz[0], swz[1], swz[2], swz[3] );
-}
-
-
-/**
- * Translate a SWZ instruction into a MOV, MUL or MAD instruction.  EG:
- *
- *   SWZ dst, src.x-y10 
- * 
- * becomes:
- *
- *   MAD dst {1,-1,0,0}, src.xyxx, {0,0,1,0}
- */
-static void emit_swz( struct st_translate *t,
-                      struct ureg_dst dst,
-                      const struct prog_src_register *SrcReg )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );
-
-   unsigned negate_mask =  SrcReg->Negate;
-
-   unsigned one_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ONE) << 0 |
-                        (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ONE) << 1 |
-                        (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ONE) << 2 |
-                        (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ONE) << 3);
-
-   unsigned zero_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ZERO) << 0 |
-                         (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ZERO) << 1 |
-                         (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ZERO) << 2 |
-                         (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ZERO) << 3);
-
-   unsigned negative_one_mask = one_mask & negate_mask;
-   unsigned positive_one_mask = one_mask & ~negate_mask;
-   
-   struct ureg_src imm;
-   unsigned i;
-   unsigned mul_swizzle[4] = {0,0,0,0};
-   unsigned add_swizzle[4] = {0,0,0,0};
-   unsigned src_swizzle[4] = {0,0,0,0};
-   boolean need_add = FALSE;
-   boolean need_mul = FALSE;
-
-   if (dst.WriteMask == 0)
-      return;
-
-   /* Is this just a MOV?
-    */
-   if (zero_mask == 0 &&
-       one_mask == 0 &&
-       (negate_mask == 0 || negate_mask == TGSI_WRITEMASK_XYZW)) 
-   {
-      ureg_MOV( ureg, dst, translate_src( t, SrcReg ));
-      return;
-   }
-
-#define IMM_ZERO    0
-#define IMM_ONE     1
-#define IMM_NEG_ONE 2
-
-   imm = ureg_imm3f( ureg, 0, 1, -1 );
-
-   for (i = 0; i < 4; i++) {
-      unsigned bit = 1 << i;
-
-      if (dst.WriteMask & bit) {
-         if (positive_one_mask & bit) {
-            mul_swizzle[i] = IMM_ZERO;
-            add_swizzle[i] = IMM_ONE;
-            need_add = TRUE;
-         }
-         else if (negative_one_mask & bit) {
-            mul_swizzle[i] = IMM_ZERO;
-            add_swizzle[i] = IMM_NEG_ONE;
-            need_add = TRUE;
-         }
-         else if (zero_mask & bit) {
-            mul_swizzle[i] = IMM_ZERO;
-            add_swizzle[i] = IMM_ZERO;
-            need_add = TRUE;
-         }
-         else {
-            add_swizzle[i] = IMM_ZERO;
-            src_swizzle[i] = GET_SWZ(SrcReg->Swizzle, i);
-            need_mul = TRUE;
-            if (negate_mask & bit) {
-               mul_swizzle[i] = IMM_NEG_ONE;
-            }
-            else {
-               mul_swizzle[i] = IMM_ONE;
-            }
-         }
-      }
-   }
-
-   if (need_mul && need_add) {
-      ureg_MAD( ureg, 
-                dst,
-                swizzle_4v( src, src_swizzle ),
-                swizzle_4v( imm, mul_swizzle ),
-                swizzle_4v( imm, add_swizzle ) );
-   }
-   else if (need_mul) {
-      ureg_MUL( ureg, 
-                dst,
-                swizzle_4v( src, src_swizzle ),
-                swizzle_4v( imm, mul_swizzle ) );
-   }
-   else if (need_add) {
-      ureg_MOV( ureg, 
-                dst,
-                swizzle_4v( imm, add_swizzle ) );
-   }
-   else {
-      debug_assert(0);
-   }
-
-#undef IMM_ZERO
-#undef IMM_ONE
-#undef IMM_NEG_ONE
-}
-
-
-/**
- * Negate the value of DDY to match GL semantics where (0,0) is the
- * lower-left corner of the window.
- * Note that the GL_ARB_fragment_coord_conventions extension will
- * effect this someday.
- */
-static void emit_ddy( struct st_translate *t,
-                      struct ureg_dst dst,
-                      const struct prog_src_register *SrcReg )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_src src = translate_src( t, SrcReg );
-   src = ureg_negate( src );
-   ureg_DDY( ureg, dst, src );
-}
-
-
-
-static unsigned
-translate_opcode( unsigned op )
-{
-   switch( op ) {
-   case OPCODE_ARL:
-      return TGSI_OPCODE_ARL;
-   case OPCODE_ABS:
-      return TGSI_OPCODE_ABS;
-   case OPCODE_ADD:
-      return TGSI_OPCODE_ADD;
-   case OPCODE_BGNLOOP:
-      return TGSI_OPCODE_BGNLOOP;
-   case OPCODE_BGNSUB:
-      return TGSI_OPCODE_BGNSUB;
-   case OPCODE_BRA:
-      return TGSI_OPCODE_BRA;
-   case OPCODE_BRK:
-      return TGSI_OPCODE_BRK;
-   case OPCODE_CAL:
-      return TGSI_OPCODE_CAL;
-   case OPCODE_CMP:
-      return TGSI_OPCODE_CMP;
-   case OPCODE_CONT:
-      return TGSI_OPCODE_CONT;
-   case OPCODE_COS:
-      return TGSI_OPCODE_COS;
-   case OPCODE_DDX:
-      return TGSI_OPCODE_DDX;
-   case OPCODE_DDY:
-      return TGSI_OPCODE_DDY;
-   case OPCODE_DP2:
-      return TGSI_OPCODE_DP2;
-   case OPCODE_DP2A:
-      return TGSI_OPCODE_DP2A;
-   case OPCODE_DP3:
-      return TGSI_OPCODE_DP3;
-   case OPCODE_DP4:
-      return TGSI_OPCODE_DP4;
-   case OPCODE_DPH:
-      return TGSI_OPCODE_DPH;
-   case OPCODE_DST:
-      return TGSI_OPCODE_DST;
-   case OPCODE_ELSE:
-      return TGSI_OPCODE_ELSE;
-   case OPCODE_EMIT_VERTEX:
-      return TGSI_OPCODE_EMIT;
-   case OPCODE_END_PRIMITIVE:
-      return TGSI_OPCODE_ENDPRIM;
-   case OPCODE_ENDIF:
-      return TGSI_OPCODE_ENDIF;
-   case OPCODE_ENDLOOP:
-      return TGSI_OPCODE_ENDLOOP;
-   case OPCODE_ENDSUB:
-      return TGSI_OPCODE_ENDSUB;
-   case OPCODE_EX2:
-      return TGSI_OPCODE_EX2;
-   case OPCODE_EXP:
-      return TGSI_OPCODE_EXP;
-   case OPCODE_FLR:
-      return TGSI_OPCODE_FLR;
-   case OPCODE_FRC:
-      return TGSI_OPCODE_FRC;
-   case OPCODE_IF:
-      return TGSI_OPCODE_IF;
-   case OPCODE_TRUNC:
-      return TGSI_OPCODE_TRUNC;
-   case OPCODE_KIL:
-      return TGSI_OPCODE_KIL;
-   case OPCODE_KIL_NV:
-      return TGSI_OPCODE_KILP;
-   case OPCODE_LG2:
-      return TGSI_OPCODE_LG2;
-   case OPCODE_LOG:
-      return TGSI_OPCODE_LOG;
-   case OPCODE_LIT:
-      return TGSI_OPCODE_LIT;
-   case OPCODE_LRP:
-      return TGSI_OPCODE_LRP;
-   case OPCODE_MAD:
-      return TGSI_OPCODE_MAD;
-   case OPCODE_MAX:
-      return TGSI_OPCODE_MAX;
-   case OPCODE_MIN:
-      return TGSI_OPCODE_MIN;
-   case OPCODE_MOV:
-      return TGSI_OPCODE_MOV;
-   case OPCODE_MUL:
-      return TGSI_OPCODE_MUL;
-   case OPCODE_NOP:
-      return TGSI_OPCODE_NOP;
-   case OPCODE_NRM3:
-      return TGSI_OPCODE_NRM;
-   case OPCODE_NRM4:
-      return TGSI_OPCODE_NRM4;
-   case OPCODE_POW:
-      return TGSI_OPCODE_POW;
-   case OPCODE_RCP:
-      return TGSI_OPCODE_RCP;
-   case OPCODE_RET:
-      return TGSI_OPCODE_RET;
-   case OPCODE_RSQ:
-      return TGSI_OPCODE_RSQ;
-   case OPCODE_SCS:
-      return TGSI_OPCODE_SCS;
-   case OPCODE_SEQ:
-      return TGSI_OPCODE_SEQ;
-   case OPCODE_SGE:
-      return TGSI_OPCODE_SGE;
-   case OPCODE_SGT:
-      return TGSI_OPCODE_SGT;
-   case OPCODE_SIN:
-      return TGSI_OPCODE_SIN;
-   case OPCODE_SLE:
-      return TGSI_OPCODE_SLE;
-   case OPCODE_SLT:
-      return TGSI_OPCODE_SLT;
-   case OPCODE_SNE:
-      return TGSI_OPCODE_SNE;
-   case OPCODE_SSG:
-      return TGSI_OPCODE_SSG;
-   case OPCODE_SUB:
-      return TGSI_OPCODE_SUB;
-   case OPCODE_TEX:
-      return TGSI_OPCODE_TEX;
-   case OPCODE_TXB:
-      return TGSI_OPCODE_TXB;
-   case OPCODE_TXD:
-      return TGSI_OPCODE_TXD;
-   case OPCODE_TXL:
-      return TGSI_OPCODE_TXL;
-   case OPCODE_TXP:
-      return TGSI_OPCODE_TXP;
-   case OPCODE_XPD:
-      return TGSI_OPCODE_XPD;
-   case OPCODE_END:
-      return TGSI_OPCODE_END;
-   default:
-      debug_assert( 0 );
-      return TGSI_OPCODE_NOP;
-   }
-}
-
-
-static void
-compile_instruction(
-   struct st_translate *t,
-   const struct prog_instruction *inst )
-{
-   struct ureg_program *ureg = t->ureg;
-   GLuint i;
-   struct ureg_dst dst[1];
-   struct ureg_src src[4];
-   unsigned num_dst;
-   unsigned num_src;
-
-   num_dst = _mesa_num_inst_dst_regs( inst->Opcode );
-   num_src = _mesa_num_inst_src_regs( inst->Opcode );
-
-   if (num_dst) 
-      dst[0] = translate_dst( t, 
-                              &inst->DstReg,
-                              inst->SaturateMode );
-
-   for (i = 0; i < num_src; i++) 
-      src[i] = translate_src( t, &inst->SrcReg[i] );
-
-   switch( inst->Opcode ) {
-   case OPCODE_SWZ:
-      emit_swz( t, dst[0], &inst->SrcReg[0] );
-      return;
-
-   case OPCODE_BGNLOOP:
-   case OPCODE_CAL:
-   case OPCODE_ELSE:
-   case OPCODE_ENDLOOP:
-   case OPCODE_IF:
-      debug_assert(num_dst == 0);
-      ureg_label_insn( ureg,
-                       translate_opcode( inst->Opcode ),
-                       src, num_src,
-                       get_label( t, inst->BranchTarget ));
-      return;
-
-   case OPCODE_TEX:
-   case OPCODE_TXB:
-   case OPCODE_TXD:
-   case OPCODE_TXL:
-   case OPCODE_TXP:
-      src[num_src++] = t->samplers[inst->TexSrcUnit];
-      ureg_tex_insn( ureg,
-                     translate_opcode( inst->Opcode ),
-                     dst, num_dst, 
-                     translate_texture_target( inst->TexSrcTarget,
-                                               inst->TexShadow ),
-                     src, num_src );
-      return;
-
-   case OPCODE_SCS:
-      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XY );
-      ureg_insn( ureg, 
-                 translate_opcode( inst->Opcode ), 
-                 dst, num_dst, 
-                 src, num_src );
-      break;
-
-   case OPCODE_XPD:
-      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XYZ );
-      ureg_insn( ureg, 
-                 translate_opcode( inst->Opcode ), 
-                 dst, num_dst, 
-                 src, num_src );
-      break;
-
-   case OPCODE_NOISE1:
-   case OPCODE_NOISE2:
-   case OPCODE_NOISE3:
-   case OPCODE_NOISE4:
-      /* At some point, a motivated person could add a better
-       * implementation of noise.  Currently not even the nvidia
-       * binary drivers do anything more than this.  In any case, the
-       * place to do this is in the GL state tracker, not the poor
-       * driver.
-       */
-      ureg_MOV( ureg, dst[0], ureg_imm1f(ureg, 0.5) );
-      break;
-		 
-   case OPCODE_DDY:
-      emit_ddy( t, dst[0], &inst->SrcReg[0] );
-      break;
-
-   default:
-      ureg_insn( ureg, 
-                 translate_opcode( inst->Opcode ), 
-                 dst, num_dst, 
-                 src, num_src );
-      break;
-   }
-}
-
-
-/**
- * Emit the TGSI instructions to adjust the WPOS pixel center convention
- * Basically, add (adjX, adjY) to the fragment position.
- */
-static void
-emit_adjusted_wpos( struct st_translate *t,
-                    const struct gl_program *program,
-                    GLfloat adjX, GLfloat adjY)
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_dst wpos_temp = ureg_DECL_temporary(ureg);
-   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];
-
-   /* Note that we bias X and Y and pass Z and W through unchanged.
-    * The shader might also use gl_FragCoord.w and .z.
-    */
-   ureg_ADD(ureg, wpos_temp, wpos_input,
-            ureg_imm4f(ureg, adjX, adjY, 0.0f, 0.0f));
-
-   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);
-}
-
-
-/**
- * Emit the TGSI instructions for inverting the WPOS y coordinate.
- * This code is unavoidable because it also depends on whether
- * a FBO is bound (STATE_FB_WPOS_Y_TRANSFORM).
- */
-static void
-emit_wpos_inversion( struct st_translate *t,
-                     const struct gl_program *program,
-                     boolean invert)
-{
-   struct ureg_program *ureg = t->ureg;
-
-   /* Fragment program uses fragment position input.
-    * Need to replace instances of INPUT[WPOS] with temp T
-    * where T = INPUT[WPOS] by y is inverted.
-    */
-   static const gl_state_index wposTransformState[STATE_LENGTH]
-      = { STATE_INTERNAL, STATE_FB_WPOS_Y_TRANSFORM, 0, 0, 0 };
-   
-   /* XXX: note we are modifying the incoming shader here!  Need to
-    * do this before emitting the constant decls below, or this
-    * will be missed:
-    */
-   unsigned wposTransConst = _mesa_add_state_reference(program->Parameters,
-                                                       wposTransformState);
-
-   struct ureg_src wpostrans = ureg_DECL_constant( ureg, wposTransConst );
-   struct ureg_dst wpos_temp;
-   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];
-
-   /* MOV wpos_temp, input[wpos]
-    */
-   if (wpos_input.File == TGSI_FILE_TEMPORARY)
-      wpos_temp = ureg_dst(wpos_input);
-   else {
-      wpos_temp = ureg_DECL_temporary( ureg );
-      ureg_MOV( ureg, wpos_temp, wpos_input );
-   }
-
-   if (invert) {
-      /* MAD wpos_temp.y, wpos_input, wpostrans.xxxx, wpostrans.yyyy
-       */
-      ureg_MAD( ureg,
-                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),
-                wpos_input,
-                ureg_scalar(wpostrans, 0),
-                ureg_scalar(wpostrans, 1));
-   } else {
-      /* MAD wpos_temp.y, wpos_input, wpostrans.zzzz, wpostrans.wwww
-       */
-      ureg_MAD( ureg,
-                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),
-                wpos_input,
-                ureg_scalar(wpostrans, 2),
-                ureg_scalar(wpostrans, 3));
-   }
-
-   /* Use wpos_temp as position input from here on:
-    */
-   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);
-}
-
-
-/**
- * Emit fragment position/ooordinate code.
- */
-static void
-emit_wpos(struct st_context *st,
-          struct st_translate *t,
-          const struct gl_program *program,
-          struct ureg_program *ureg)
-{
-   const struct gl_fragment_program *fp =
-      (const struct gl_fragment_program *) program;
-   struct pipe_screen *pscreen = st->pipe->screen;
-   boolean invert = FALSE;
-
-   if (fp->OriginUpperLeft) {
-      /* Fragment shader wants origin in upper-left */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT)) {
-         /* the driver supports upper-left origin */
-      }
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) {
-         /* the driver supports lower-left origin, need to invert Y */
-         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);
-         invert = TRUE;
-      }
-      else
-         assert(0);
-   }
-   else {
-      /* Fragment shader wants origin in lower-left */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT))
-         /* the driver supports lower-left origin */
-         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT))
-         /* the driver supports upper-left origin, need to invert Y */
-         invert = TRUE;
-      else
-         assert(0);
-   }
-   
-   if (fp->PixelCenterInteger) {
-      /* Fragment shader wants pixel center integer */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER))
-         /* the driver supports pixel center integer */
-         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER))
-         /* the driver supports pixel center half integer, need to bias X,Y */
-         emit_adjusted_wpos(t, program, 0.5f, invert ? 0.5f : -0.5f);
-      else
-         assert(0);
-   }
-   else {
-      /* Fragment shader wants pixel center half integer */
-      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER)) {
-         /* the driver supports pixel center half integer */
-      }
-      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) {
-         /* the driver supports pixel center integer, need to bias X,Y */
-         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);
-         emit_adjusted_wpos(t, program, 0.5f, invert ? -0.5f : 0.5f);
-      }
-      else
-         assert(0);
-   }
-
-   /* we invert after adjustment so that we avoid the MOV to temporary,
-    * and reuse the adjustment ADD instead */
-   emit_wpos_inversion(t, program, invert);
-}
-
-
-/**
- * OpenGL's fragment gl_FrontFace input is 1 for front-facing, 0 for back.
- * TGSI uses +1 for front, -1 for back.
- * This function converts the TGSI value to the GL value.  Simply clamping/
- * saturating the value to [0,1] does the job.
- */
-static void
-emit_face_var( struct st_translate *t,
-               const struct gl_program *program )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_dst face_temp = ureg_DECL_temporary( ureg );
-   struct ureg_src face_input = t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]];
-
-   /* MOV_SAT face_temp, input[face]
-    */
-   face_temp = ureg_saturate( face_temp );
-   ureg_MOV( ureg, face_temp, face_input );
-
-   /* Use face_temp as face input from here on:
-    */
-   t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]] = ureg_src(face_temp);
-}
-
-
-static void
-emit_edgeflags( struct st_translate *t,
-                 const struct gl_program *program )
-{
-   struct ureg_program *ureg = t->ureg;
-   struct ureg_dst edge_dst = t->outputs[t->outputMapping[VERT_RESULT_EDGE]];
-   struct ureg_src edge_src = t->inputs[t->inputMapping[VERT_ATTRIB_EDGEFLAG]];
-
-   ureg_MOV( ureg, edge_dst, edge_src );
-}
-
-
-/**
- * Translate Mesa program to TGSI format.
- * \param program  the program to translate
- * \param numInputs  number of input registers used
- * \param inputMapping  maps Mesa fragment program inputs to TGSI generic
- *                      input indexes
- * \param inputSemanticName  the TGSI_SEMANTIC flag for each input
- * \param inputSemanticIndex  the semantic index (ex: which texcoord) for
- *                            each input
- * \param interpMode  the TGSI_INTERPOLATE_LINEAR/PERSP mode for each input
- * \param numOutputs  number of output registers used
- * \param outputMapping  maps Mesa fragment program outputs to TGSI
- *                       generic outputs
- * \param outputSemanticName  the TGSI_SEMANTIC flag for each output
- * \param outputSemanticIndex  the semantic index (ex: which texcoord) for
- *                             each output
- *
- * \return  PIPE_OK or PIPE_ERROR_OUT_OF_MEMORY
- */
-enum pipe_error
-st_translate_mesa_program(
-   struct gl_context *ctx,
-   uint procType,
-   struct ureg_program *ureg,
-   const struct gl_program *program,
-   GLuint numInputs,
-   const GLuint inputMapping[],
-   const ubyte inputSemanticName[],
-   const ubyte inputSemanticIndex[],
-   const GLuint interpMode[],
-   GLuint numOutputs,
-   const GLuint outputMapping[],
-   const ubyte outputSemanticName[],
-   const ubyte outputSemanticIndex[],
-   boolean passthrough_edgeflags )
-{
-   struct st_translate translate, *t;
-   unsigned i;
-   enum pipe_error ret = PIPE_OK;
-
-   assert(numInputs <= Elements(t->inputs));
-   assert(numOutputs <= Elements(t->outputs));
-
-   t = &translate;
-   memset(t, 0, sizeof *t);
-
-   t->procType = procType;
-   t->inputMapping = inputMapping;
-   t->outputMapping = outputMapping;
-   t->ureg = ureg;
-   t->pointSizeOutIndex = -1;
-   t->prevInstWrotePointSize = GL_FALSE;
-
-   /*_mesa_print_program(program);*/
-
-   /*
-    * Declare input attributes.
-    */
-   if (procType == TGSI_PROCESSOR_FRAGMENT) {
-      for (i = 0; i < numInputs; i++) {
-         if (program->InputFlags[0] & PROG_PARAM_BIT_CYL_WRAP) {
-            t->inputs[i] = ureg_DECL_fs_input_cyl(ureg,
-                                                  inputSemanticName[i],
-                                                  inputSemanticIndex[i],
-                                                  interpMode[i],
-                                                  TGSI_CYLINDRICAL_WRAP_X);
-         }
-         else {
-            t->inputs[i] = ureg_DECL_fs_input(ureg,
-                                              inputSemanticName[i],
-                                              inputSemanticIndex[i],
-                                              interpMode[i]);
-         }
-      }
-
-      if (program->InputsRead & FRAG_BIT_WPOS) {
-         /* Must do this after setting up t->inputs, and before
-          * emitting constant references, below:
-          */
-         emit_wpos(st_context(ctx), t, program, ureg);
-      }
-
-      if (program->InputsRead & FRAG_BIT_FACE) {
-         emit_face_var( t, program );
-      }
-
-      /*
-       * Declare output attributes.
-       */
-      for (i = 0; i < numOutputs; i++) {
-         switch (outputSemanticName[i]) {
-         case TGSI_SEMANTIC_POSITION:
-            t->outputs[i] = ureg_DECL_output( ureg,
-                                              TGSI_SEMANTIC_POSITION, /* Z / Depth */
-                                              outputSemanticIndex[i] );
-
-            t->outputs[i] = ureg_writemask( t->outputs[i],
-                                            TGSI_WRITEMASK_Z );
-            break;
-         case TGSI_SEMANTIC_STENCIL:
-            t->outputs[i] = ureg_DECL_output( ureg,
-                                              TGSI_SEMANTIC_STENCIL, /* Stencil */
-                                              outputSemanticIndex[i] );
-            t->outputs[i] = ureg_writemask( t->outputs[i],
-                                            TGSI_WRITEMASK_Y );
-            break;
-         case TGSI_SEMANTIC_COLOR:
-            t->outputs[i] = ureg_DECL_output( ureg,
-                                              TGSI_SEMANTIC_COLOR,
-                                              outputSemanticIndex[i] );
-            break;
-         default:
-            debug_assert(0);
-            return 0;
-         }
-      }
-   }
-   else if (procType == TGSI_PROCESSOR_GEOMETRY) {
-      for (i = 0; i < numInputs; i++) {
-         t->inputs[i] = ureg_DECL_gs_input(ureg,
-                                           i,
-                                           inputSemanticName[i],
-                                           inputSemanticIndex[i]);
-      }
-
-      for (i = 0; i < numOutputs; i++) {
-         t->outputs[i] = ureg_DECL_output( ureg,
-                                           outputSemanticName[i],
-                                           outputSemanticIndex[i] );
-      }
-   }
-   else {
-      assert(procType == TGSI_PROCESSOR_VERTEX);
-
-      for (i = 0; i < numInputs; i++) {
-         t->inputs[i] = ureg_DECL_vs_input(ureg, i);
-      }
-
-      for (i = 0; i < numOutputs; i++) {
-         t->outputs[i] = ureg_DECL_output( ureg,
-                                           outputSemanticName[i],
-                                           outputSemanticIndex[i] );
-         if ((outputSemanticName[i] == TGSI_SEMANTIC_PSIZE) && program->Id) {
-            /* Writing to the point size result register requires special
-             * handling to implement clamping.
-             */
-            static const gl_state_index pointSizeClampState[STATE_LENGTH]
-               = { STATE_INTERNAL, STATE_POINT_SIZE_IMPL_CLAMP, 0, 0, 0 };
-               /* XXX: note we are modifying the incoming shader here!  Need to
-               * do this before emitting the constant decls below, or this
-               * will be missed:
-               */
-            unsigned pointSizeClampConst =
-               _mesa_add_state_reference(program->Parameters,
-                                         pointSizeClampState);
-            struct ureg_dst psizregtemp = ureg_DECL_temporary( ureg );
-            t->pointSizeConst = ureg_DECL_constant( ureg, pointSizeClampConst );
-            t->pointSizeResult = t->outputs[i];
-            t->pointSizeOutIndex = i;
-            t->outputs[i] = psizregtemp;
-         }
-      }
-      if (passthrough_edgeflags)
-         emit_edgeflags( t, program );
-   }
-
-   /* Declare address register.
-    */
-   if (program->NumAddressRegs > 0) {
-      debug_assert( program->NumAddressRegs == 1 );
-      t->address[0] = ureg_DECL_address( ureg );
-   }
-
-   /* Declare misc input registers
-    */
-   {
-      GLbitfield sysInputs = program->SystemValuesRead;
-      unsigned numSys = 0;
-      for (i = 0; sysInputs; i++) {
-         if (sysInputs & (1 << i)) {
-            unsigned semName = mesa_sysval_to_semantic[i];
-            t->systemValues[i] = ureg_DECL_system_value(ureg, numSys, semName, 0);
-            numSys++;
-            sysInputs &= ~(1 << i);
-         }
-      }
-   }
-
-   if (program->IndirectRegisterFiles & (1 << PROGRAM_TEMPORARY)) {
-      /* If temps are accessed with indirect addressing, declare temporaries
-       * in sequential order.  Else, we declare them on demand elsewhere.
-       */
-      for (i = 0; i < program->NumTemporaries; i++) {
-         /* XXX use TGSI_FILE_TEMPORARY_ARRAY when it's supported by ureg */
-         t->temps[i] = ureg_DECL_temporary( t->ureg );
-      }
-   }
-
-   /* Emit constants and immediates.  Mesa uses a single index space
-    * for these, so we put all the translated regs in t->constants.
-    */
-   if (program->Parameters) {
-      t->constants = CALLOC( program->Parameters->NumParameters,
-                             sizeof t->constants[0] );
-      if (t->constants == NULL) {
-         ret = PIPE_ERROR_OUT_OF_MEMORY;
-         goto out;
-      }
-
-      for (i = 0; i < program->Parameters->NumParameters; i++) {
-         switch (program->Parameters->Parameters[i].Type) {
-         case PROGRAM_ENV_PARAM:
-         case PROGRAM_LOCAL_PARAM:
-         case PROGRAM_STATE_VAR:
-         case PROGRAM_NAMED_PARAM:
-         case PROGRAM_UNIFORM:
-            t->constants[i] = ureg_DECL_constant( ureg, i );
-            break;
-
-            /* Emit immediates only when there's no indirect addressing of
-             * the const buffer.
-             * FIXME: Be smarter and recognize param arrays:
-             * indirect addressing is only valid within the referenced
-             * array.
-             */
-         case PROGRAM_CONSTANT:
-            if (program->IndirectRegisterFiles & PROGRAM_ANY_CONST)
-               t->constants[i] = ureg_DECL_constant( ureg, i );
-            else
-               t->constants[i] = 
-                  ureg_DECL_immediate( ureg,
-                                       program->Parameters->ParameterValues[i],
-                                       4 );
-            break;
-         default:
-            break;
-         }
-      }
-   }
-
-   /* texture samplers */
-   for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
-      if (program->SamplersUsed & (1 << i)) {
-         t->samplers[i] = ureg_DECL_sampler( ureg, i );
-      }
-   }
-
-   /* Emit each instruction in turn:
-    */
-   for (i = 0; i < program->NumInstructions; i++) {
-      set_insn_start( t, ureg_get_instruction_number( ureg ));
-      compile_instruction( t, &program->Instructions[i] );
-
-      if (t->prevInstWrotePointSize && program->Id) {
-         /* The previous instruction wrote to the (fake) vertex point size
-          * result register.  Now we need to clamp that value to the min/max
-          * point size range, putting the result into the real point size
-          * register.
-          * Note that we can't do this easily at the end of program due to
-          * possible early return.
-          */
-         set_insn_start( t, ureg_get_instruction_number( ureg ));
-         ureg_MAX( t->ureg,
-                   ureg_writemask(t->outputs[t->pointSizeOutIndex], WRITEMASK_X),
-                   ureg_src(t->outputs[t->pointSizeOutIndex]),
-                   ureg_swizzle(t->pointSizeConst, 1,1,1,1));
-         ureg_MIN( t->ureg, ureg_writemask(t->pointSizeResult, WRITEMASK_X),
-                   ureg_src(t->outputs[t->pointSizeOutIndex]),
-                   ureg_swizzle(t->pointSizeConst, 2,2,2,2));
-      }
-      t->prevInstWrotePointSize = GL_FALSE;
-   }
-
-   /* Fix up all emitted labels:
-    */
-   for (i = 0; i < t->labels_count; i++) {
-      ureg_fixup_label( ureg,
-                        t->labels[i].token,
-                        t->insn[t->labels[i].branch_target] );
-   }
-
-out:
-   FREE(t->insn);
-   FREE(t->labels);
-   FREE(t->constants);
-
-   if (t->error) {
-      debug_printf("%s: translate error flag set\n", __FUNCTION__);
-   }
-
-   return ret;
-}
-
-
-/**
- * Tokens cannot be free with free otherwise the builtin gallium
- * malloc debugging will get confused.
- */
-void
-st_free_tokens(const struct tgsi_token *tokens)
-{
-   FREE((void *)tokens);
-}
+/**************************************************************************

+ * 

+ * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ * 

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the

+ * "Software"), to deal in the Software without restriction, including

+ * without limitation the rights to use, copy, modify, merge, publish,

+ * distribute, sub license, and/or sell copies of the Software, and to

+ * permit persons to whom the Software is furnished to do so, subject to

+ * the following conditions:

+ * 

+ * The above copyright notice and this permission notice (including the

+ * next paragraph) shall be included in all copies or substantial portions

+ * of the Software.

+ * 

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ * 

+ **************************************************************************/

+

+/*

+ * \author

+ * Michal Krol,

+ * Keith Whitwell

+ */

+

+#include "pipe/p_compiler.h"

+#include "pipe/p_context.h"

+#include "pipe/p_screen.h"

+#include "pipe/p_shader_tokens.h"

+#include "pipe/p_state.h"

+#include "tgsi/tgsi_ureg.h"

+#include "st_mesa_to_tgsi.h"

+#include "st_context.h"

+#include "program/prog_instruction.h"

+#include "program/prog_parameter.h"

+#include "util/u_debug.h"

+#include "util/u_math.h"

+#include "util/u_memory.h"

+

+

+#define PROGRAM_ANY_CONST ((1 << PROGRAM_LOCAL_PARAM) |  \

+                           (1 << PROGRAM_ENV_PARAM) |    \

+                           (1 << PROGRAM_STATE_VAR) |    \

+                           (1 << PROGRAM_NAMED_PARAM) |  \

+                           (1 << PROGRAM_CONSTANT) |     \

+                           (1 << PROGRAM_UNIFORM))

+

+

+struct label {

+   unsigned branch_target;

+   unsigned token;

+};

+

+

+/**

+ * Intermediate state used during shader translation.

+ */

+struct st_translate {

+   struct ureg_program *ureg;

+

+   struct ureg_dst temps[MAX_PROGRAM_TEMPS];

+   struct ureg_src *constants;

+   struct ureg_dst outputs[PIPE_MAX_SHADER_OUTPUTS];

+   struct ureg_src inputs[PIPE_MAX_SHADER_INPUTS];

+   struct ureg_dst address[1];

+   struct ureg_src samplers[PIPE_MAX_SAMPLERS];

+   struct ureg_src systemValues[SYSTEM_VALUE_MAX];

+

+   /* Extra info for handling point size clamping in vertex shader */

+   struct ureg_dst pointSizeResult; /**< Actual point size output register */

+   struct ureg_src pointSizeConst;  /**< Point size range constant register */

+   GLint pointSizeOutIndex;         /**< Temp point size output register */

+   GLboolean prevInstWrotePointSize;

+

+   const GLuint *inputMapping;

+   const GLuint *outputMapping;

+

+   /* For every instruction that contains a label (eg CALL), keep

+    * details so that we can go back afterwards and emit the correct

+    * tgsi instruction number for each label.

+    */

+   struct label *labels;

+   unsigned labels_size;

+   unsigned labels_count;

+

+   /* Keep a record of the tgsi instruction number that each mesa

+    * instruction starts at, will be used to fix up labels after

+    * translation.

+    */

+   unsigned *insn;

+   unsigned insn_size;

+   unsigned insn_count;

+

+   unsigned procType;  /**< TGSI_PROCESSOR_VERTEX/FRAGMENT */

+

+   boolean error;

+};

+

+

+/** Map Mesa's SYSTEM_VALUE_x to TGSI_SEMANTIC_x */

+static unsigned mesa_sysval_to_semantic[SYSTEM_VALUE_MAX] = {

+   TGSI_SEMANTIC_FACE,

+   TGSI_SEMANTIC_INSTANCEID

+};

+

+

+/**

+ * Make note of a branch to a label in the TGSI code.

+ * After we've emitted all instructions, we'll go over the list

+ * of labels built here and patch the TGSI code with the actual

+ * location of each label.

+ */

+static unsigned *get_label( struct st_translate *t,

+                            unsigned branch_target )

+{

+   unsigned i;

+

+   if (t->labels_count + 1 >= t->labels_size) {

+      unsigned old_size = t->labels_size;

+      t->labels_size = 1 << (util_logbase2(t->labels_size) + 1);

+      t->labels = REALLOC( t->labels, 

+                           old_size * sizeof t->labels[0], 

+                           t->labels_size * sizeof t->labels[0] );

+      if (t->labels == NULL) {

+         static unsigned dummy;

+         t->error = TRUE;

+         return &dummy;

+      }

+   }

+

+   i = t->labels_count++;

+   t->labels[i].branch_target = branch_target;

+   return &t->labels[i].token;

+}

+

+

+/**

+ * Called prior to emitting the TGSI code for each Mesa instruction.

+ * Allocate additional space for instructions if needed.

+ * Update the insn[] array so the next Mesa instruction points to

+ * the next TGSI instruction.

+ */

+static void set_insn_start( struct st_translate *t,

+                            unsigned start )

+{

+   if (t->insn_count + 1 >= t->insn_size) {

+      unsigned old_size = t->insn_size;

+      t->insn_size = 1 << (util_logbase2(t->insn_size) + 1);

+      t->insn = REALLOC( t->insn, 

+                         old_size * sizeof t->insn[0], 

+                         t->insn_size * sizeof t->insn[0] );

+      if (t->insn == NULL) {

+         t->error = TRUE;

+         return;

+      }

+   }

+

+   t->insn[t->insn_count++] = start;

+}

+

+

+/**

+ * Map a Mesa dst register to a TGSI ureg_dst register.

+ */

+static struct ureg_dst

+dst_register( struct st_translate *t,

+              gl_register_file file,

+              GLuint index )

+{

+   switch( file ) {

+   case PROGRAM_UNDEFINED:

+      return ureg_dst_undef();

+

+   case PROGRAM_TEMPORARY:

+      if (ureg_dst_is_undef(t->temps[index]))

+         t->temps[index] = ureg_DECL_temporary( t->ureg );

+

+      return t->temps[index];

+

+   case PROGRAM_OUTPUT:

+      if (t->procType == TGSI_PROCESSOR_VERTEX && index == VERT_RESULT_PSIZ)

+         t->prevInstWrotePointSize = GL_TRUE;

+

+      if (t->procType == TGSI_PROCESSOR_VERTEX)

+         assert(index < VERT_RESULT_MAX);

+      else if (t->procType == TGSI_PROCESSOR_FRAGMENT)

+         assert(index < FRAG_RESULT_MAX);

+      else

+         assert(index < GEOM_RESULT_MAX);

+

+      assert(t->outputMapping[index] < Elements(t->outputs));

+

+      return t->outputs[t->outputMapping[index]];

+

+   case PROGRAM_ADDRESS:

+      return t->address[index];

+

+   default:

+      debug_assert( 0 );

+      return ureg_dst_undef();

+   }

+}

+

+

+/**

+ * Map a Mesa src register to a TGSI ureg_src register.

+ */

+static struct ureg_src

+src_register( struct st_translate *t,

+              gl_register_file file,

+              GLint index )

+{

+   switch( file ) {

+   case PROGRAM_UNDEFINED:

+      return ureg_src_undef();

+

+   case PROGRAM_TEMPORARY:

+      assert(index >= 0);

+      assert(index < Elements(t->temps));

+      if (ureg_dst_is_undef(t->temps[index]))

+         t->temps[index] = ureg_DECL_temporary( t->ureg );

+      return ureg_src(t->temps[index]);

+

+   case PROGRAM_NAMED_PARAM:

+   case PROGRAM_ENV_PARAM:

+   case PROGRAM_LOCAL_PARAM:

+   case PROGRAM_UNIFORM:

+      assert(index >= 0);

+      return t->constants[index];

+   case PROGRAM_STATE_VAR:

+   case PROGRAM_CONSTANT:       /* ie, immediate */

+      if (index < 0)

+         return ureg_DECL_constant( t->ureg, 0 );

+      else

+         return t->constants[index];

+

+   case PROGRAM_INPUT:

+      assert(t->inputMapping[index] < Elements(t->inputs));

+      return t->inputs[t->inputMapping[index]];

+

+   case PROGRAM_OUTPUT:

+      assert(t->outputMapping[index] < Elements(t->outputs));

+      return ureg_src(t->outputs[t->outputMapping[index]]); /* not needed? */

+

+   case PROGRAM_ADDRESS:

+      return ureg_src(t->address[index]);

+

+   case PROGRAM_SYSTEM_VALUE:

+      assert(index < Elements(t->systemValues));

+      return t->systemValues[index];

+

+   default:

+      debug_assert( 0 );

+      return ureg_src_undef();

+   }

+}

+

+

+/**

+ * Map mesa texture target to TGSI texture target.

+ */

+static unsigned

+translate_texture_target( GLuint textarget,

+                          GLboolean shadow )

+{

+   if (shadow) {

+      switch( textarget ) {

+      case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_SHADOW1D;

+      case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_SHADOW2D;

+      case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_SHADOWRECT;

+      default: break;

+      }

+   }

+

+   switch( textarget ) {

+   case TEXTURE_1D_INDEX:   return TGSI_TEXTURE_1D;

+   case TEXTURE_2D_INDEX:   return TGSI_TEXTURE_2D;

+   case TEXTURE_3D_INDEX:   return TGSI_TEXTURE_3D;

+   case TEXTURE_CUBE_INDEX: return TGSI_TEXTURE_CUBE;

+   case TEXTURE_RECT_INDEX: return TGSI_TEXTURE_RECT;

+   case TEXTURE_1D_ARRAY_INDEX:   return TGSI_TEXTURE_1D_ARRAY;

+   case TEXTURE_2D_ARRAY_INDEX:   return TGSI_TEXTURE_2D_ARRAY;

+   default:

+      debug_assert( 0 );

+      return TGSI_TEXTURE_1D;

+   }

+}

+

+

+/**

+ * Create a TGSI ureg_dst register from a Mesa dest register.

+ */

+static struct ureg_dst

+translate_dst( struct st_translate *t,

+               const struct prog_dst_register *DstReg,

+               boolean saturate )

+{

+   struct ureg_dst dst = dst_register( t, 

+                                       DstReg->File,

+                                       DstReg->Index );

+

+   dst = ureg_writemask( dst, 

+                         DstReg->WriteMask );

+   

+   if (saturate)

+      dst = ureg_saturate( dst );

+

+   if (DstReg->RelAddr)

+      dst = ureg_dst_indirect( dst, ureg_src(t->address[0]) );

+

+   return dst;

+}

+

+

+/**

+ * Create a TGSI ureg_src register from a Mesa src register.

+ */

+static struct ureg_src

+translate_src( struct st_translate *t,

+               const struct prog_src_register *SrcReg )

+{

+   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );

+

+   if (t->procType == TGSI_PROCESSOR_GEOMETRY && SrcReg->HasIndex2) {

+      src = src_register( t, SrcReg->File, SrcReg->Index2 );

+      if (SrcReg->RelAddr2)

+         src = ureg_src_dimension_indirect( src, ureg_src(t->address[0]),

+                                            SrcReg->Index);

+      else

+         src = ureg_src_dimension( src, SrcReg->Index);

+   }

+

+   src = ureg_swizzle( src,

+                       GET_SWZ( SrcReg->Swizzle, 0 ) & 0x3,

+                       GET_SWZ( SrcReg->Swizzle, 1 ) & 0x3,

+                       GET_SWZ( SrcReg->Swizzle, 2 ) & 0x3,

+                       GET_SWZ( SrcReg->Swizzle, 3 ) & 0x3);

+

+   if (SrcReg->Negate == NEGATE_XYZW)

+      src = ureg_negate(src);

+

+   if (SrcReg->Abs) 

+      src = ureg_abs(src);

+

+   if (SrcReg->RelAddr) {

+      src = ureg_src_indirect( src, ureg_src(t->address[0]));

+      if (SrcReg->File != PROGRAM_INPUT &&

+          SrcReg->File != PROGRAM_OUTPUT) {

+         /* If SrcReg->Index was negative, it was set to zero in

+          * src_register().  Reassign it now.  But don't do this

+          * for input/output regs since they get remapped while

+          * const buffers don't.

+          */

+         src.Index = SrcReg->Index;

+      }

+   }

+

+   return src;

+}

+

+

+static struct ureg_src swizzle_4v( struct ureg_src src,

+                                   const unsigned *swz )

+{

+   return ureg_swizzle( src, swz[0], swz[1], swz[2], swz[3] );

+}

+

+

+/**

+ * Translate a SWZ instruction into a MOV, MUL or MAD instruction.  EG:

+ *

+ *   SWZ dst, src.x-y10 

+ * 

+ * becomes:

+ *

+ *   MAD dst {1,-1,0,0}, src.xyxx, {0,0,1,0}

+ */

+static void emit_swz( struct st_translate *t,

+                      struct ureg_dst dst,

+                      const struct prog_src_register *SrcReg )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_src src = src_register( t, SrcReg->File, SrcReg->Index );

+

+   unsigned negate_mask =  SrcReg->Negate;

+

+   unsigned one_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ONE) << 0 |

+                        (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ONE) << 1 |

+                        (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ONE) << 2 |

+                        (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ONE) << 3);

+

+   unsigned zero_mask = ((GET_SWZ(SrcReg->Swizzle, 0) == SWIZZLE_ZERO) << 0 |

+                         (GET_SWZ(SrcReg->Swizzle, 1) == SWIZZLE_ZERO) << 1 |

+                         (GET_SWZ(SrcReg->Swizzle, 2) == SWIZZLE_ZERO) << 2 |

+                         (GET_SWZ(SrcReg->Swizzle, 3) == SWIZZLE_ZERO) << 3);

+

+   unsigned negative_one_mask = one_mask & negate_mask;

+   unsigned positive_one_mask = one_mask & ~negate_mask;

+   

+   struct ureg_src imm;

+   unsigned i;

+   unsigned mul_swizzle[4] = {0,0,0,0};

+   unsigned add_swizzle[4] = {0,0,0,0};

+   unsigned src_swizzle[4] = {0,0,0,0};

+   boolean need_add = FALSE;

+   boolean need_mul = FALSE;

+

+   if (dst.WriteMask == 0)

+      return;

+

+   /* Is this just a MOV?

+    */

+   if (zero_mask == 0 &&

+       one_mask == 0 &&

+       (negate_mask == 0 || negate_mask == TGSI_WRITEMASK_XYZW)) 

+   {

+      ureg_MOV( ureg, dst, translate_src( t, SrcReg ));

+      return;

+   }

+

+#define IMM_ZERO    0

+#define IMM_ONE     1

+#define IMM_NEG_ONE 2

+

+   imm = ureg_imm3f( ureg, 0, 1, -1 );

+

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

+      unsigned bit = 1 << i;

+

+      if (dst.WriteMask & bit) {

+         if (positive_one_mask & bit) {

+            mul_swizzle[i] = IMM_ZERO;

+            add_swizzle[i] = IMM_ONE;

+            need_add = TRUE;

+         }

+         else if (negative_one_mask & bit) {

+            mul_swizzle[i] = IMM_ZERO;

+            add_swizzle[i] = IMM_NEG_ONE;

+            need_add = TRUE;

+         }

+         else if (zero_mask & bit) {

+            mul_swizzle[i] = IMM_ZERO;

+            add_swizzle[i] = IMM_ZERO;

+            need_add = TRUE;

+         }

+         else {

+            add_swizzle[i] = IMM_ZERO;

+            src_swizzle[i] = GET_SWZ(SrcReg->Swizzle, i);

+            need_mul = TRUE;

+            if (negate_mask & bit) {

+               mul_swizzle[i] = IMM_NEG_ONE;

+            }

+            else {

+               mul_swizzle[i] = IMM_ONE;

+            }

+         }

+      }

+   }

+

+   if (need_mul && need_add) {

+      ureg_MAD( ureg, 

+                dst,

+                swizzle_4v( src, src_swizzle ),

+                swizzle_4v( imm, mul_swizzle ),

+                swizzle_4v( imm, add_swizzle ) );

+   }

+   else if (need_mul) {

+      ureg_MUL( ureg, 

+                dst,

+                swizzle_4v( src, src_swizzle ),

+                swizzle_4v( imm, mul_swizzle ) );

+   }

+   else if (need_add) {

+      ureg_MOV( ureg, 

+                dst,

+                swizzle_4v( imm, add_swizzle ) );

+   }

+   else {

+      debug_assert(0);

+   }

+

+#undef IMM_ZERO

+#undef IMM_ONE

+#undef IMM_NEG_ONE

+}

+

+

+/**

+ * Negate the value of DDY to match GL semantics where (0,0) is the

+ * lower-left corner of the window.

+ * Note that the GL_ARB_fragment_coord_conventions extension will

+ * effect this someday.

+ */

+static void emit_ddy( struct st_translate *t,

+                      struct ureg_dst dst,

+                      const struct prog_src_register *SrcReg )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_src src = translate_src( t, SrcReg );

+   src = ureg_negate( src );

+   ureg_DDY( ureg, dst, src );

+}

+

+

+

+static unsigned

+translate_opcode( unsigned op )

+{

+   switch( op ) {

+   case OPCODE_ARL:

+      return TGSI_OPCODE_ARL;

+   case OPCODE_ABS:

+      return TGSI_OPCODE_ABS;

+   case OPCODE_ADD:

+      return TGSI_OPCODE_ADD;

+   case OPCODE_BGNLOOP:

+      return TGSI_OPCODE_BGNLOOP;

+   case OPCODE_BGNSUB:

+      return TGSI_OPCODE_BGNSUB;

+   case OPCODE_BRA:

+      return TGSI_OPCODE_BRA;

+   case OPCODE_BRK:

+      return TGSI_OPCODE_BRK;

+   case OPCODE_CAL:

+      return TGSI_OPCODE_CAL;

+   case OPCODE_CMP:

+      return TGSI_OPCODE_CMP;

+   case OPCODE_CONT:

+      return TGSI_OPCODE_CONT;

+   case OPCODE_COS:

+      return TGSI_OPCODE_COS;

+   case OPCODE_DDX:

+      return TGSI_OPCODE_DDX;

+   case OPCODE_DDY:

+      return TGSI_OPCODE_DDY;

+   case OPCODE_DP2:

+      return TGSI_OPCODE_DP2;

+   case OPCODE_DP2A:

+      return TGSI_OPCODE_DP2A;

+   case OPCODE_DP3:

+      return TGSI_OPCODE_DP3;

+   case OPCODE_DP4:

+      return TGSI_OPCODE_DP4;

+   case OPCODE_DPH:

+      return TGSI_OPCODE_DPH;

+   case OPCODE_DST:

+      return TGSI_OPCODE_DST;

+   case OPCODE_ELSE:

+      return TGSI_OPCODE_ELSE;

+   case OPCODE_EMIT_VERTEX:

+      return TGSI_OPCODE_EMIT;

+   case OPCODE_END_PRIMITIVE:

+      return TGSI_OPCODE_ENDPRIM;

+   case OPCODE_ENDIF:

+      return TGSI_OPCODE_ENDIF;

+   case OPCODE_ENDLOOP:

+      return TGSI_OPCODE_ENDLOOP;

+   case OPCODE_ENDSUB:

+      return TGSI_OPCODE_ENDSUB;

+   case OPCODE_EX2:

+      return TGSI_OPCODE_EX2;

+   case OPCODE_EXP:

+      return TGSI_OPCODE_EXP;

+   case OPCODE_FLR:

+      return TGSI_OPCODE_FLR;

+   case OPCODE_FRC:

+      return TGSI_OPCODE_FRC;

+   case OPCODE_IF:

+      return TGSI_OPCODE_IF;

+   case OPCODE_TRUNC:

+      return TGSI_OPCODE_TRUNC;

+   case OPCODE_KIL:

+      return TGSI_OPCODE_KIL;

+   case OPCODE_KIL_NV:

+      return TGSI_OPCODE_KILP;

+   case OPCODE_LG2:

+      return TGSI_OPCODE_LG2;

+   case OPCODE_LOG:

+      return TGSI_OPCODE_LOG;

+   case OPCODE_LIT:

+      return TGSI_OPCODE_LIT;

+   case OPCODE_LRP:

+      return TGSI_OPCODE_LRP;

+   case OPCODE_MAD:

+      return TGSI_OPCODE_MAD;

+   case OPCODE_MAX:

+      return TGSI_OPCODE_MAX;

+   case OPCODE_MIN:

+      return TGSI_OPCODE_MIN;

+   case OPCODE_MOV:

+      return TGSI_OPCODE_MOV;

+   case OPCODE_MUL:

+      return TGSI_OPCODE_MUL;

+   case OPCODE_NOP:

+      return TGSI_OPCODE_NOP;

+   case OPCODE_NRM3:

+      return TGSI_OPCODE_NRM;

+   case OPCODE_NRM4:

+      return TGSI_OPCODE_NRM4;

+   case OPCODE_POW:

+      return TGSI_OPCODE_POW;

+   case OPCODE_RCP:

+      return TGSI_OPCODE_RCP;

+   case OPCODE_RET:

+      return TGSI_OPCODE_RET;

+   case OPCODE_RSQ:

+      return TGSI_OPCODE_RSQ;

+   case OPCODE_SCS:

+      return TGSI_OPCODE_SCS;

+   case OPCODE_SEQ:

+      return TGSI_OPCODE_SEQ;

+   case OPCODE_SGE:

+      return TGSI_OPCODE_SGE;

+   case OPCODE_SGT:

+      return TGSI_OPCODE_SGT;

+   case OPCODE_SIN:

+      return TGSI_OPCODE_SIN;

+   case OPCODE_SLE:

+      return TGSI_OPCODE_SLE;

+   case OPCODE_SLT:

+      return TGSI_OPCODE_SLT;

+   case OPCODE_SNE:

+      return TGSI_OPCODE_SNE;

+   case OPCODE_SSG:

+      return TGSI_OPCODE_SSG;

+   case OPCODE_SUB:

+      return TGSI_OPCODE_SUB;

+   case OPCODE_TEX:

+      return TGSI_OPCODE_TEX;

+   case OPCODE_TXB:

+      return TGSI_OPCODE_TXB;

+   case OPCODE_TXD:

+      return TGSI_OPCODE_TXD;

+   case OPCODE_TXL:

+      return TGSI_OPCODE_TXL;

+   case OPCODE_TXP:

+      return TGSI_OPCODE_TXP;

+   case OPCODE_XPD:

+      return TGSI_OPCODE_XPD;

+   case OPCODE_END:

+      return TGSI_OPCODE_END;

+   default:

+      debug_assert( 0 );

+      return TGSI_OPCODE_NOP;

+   }

+}

+

+

+static void

+compile_instruction(

+   struct st_translate *t,

+   const struct prog_instruction *inst )

+{

+   struct ureg_program *ureg = t->ureg;

+   GLuint i;

+   struct ureg_dst dst[1];

+   struct ureg_src src[4];

+   unsigned num_dst;

+   unsigned num_src;

+

+   num_dst = _mesa_num_inst_dst_regs( inst->Opcode );

+   num_src = _mesa_num_inst_src_regs( inst->Opcode );

+

+   if (num_dst) 

+      dst[0] = translate_dst( t, 

+                              &inst->DstReg,

+                              inst->SaturateMode );

+

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

+      src[i] = translate_src( t, &inst->SrcReg[i] );

+

+   switch( inst->Opcode ) {

+   case OPCODE_SWZ:

+      emit_swz( t, dst[0], &inst->SrcReg[0] );

+      return;

+

+   case OPCODE_BGNLOOP:

+   case OPCODE_CAL:

+   case OPCODE_ELSE:

+   case OPCODE_ENDLOOP:

+   case OPCODE_IF:

+      debug_assert(num_dst == 0);

+      ureg_label_insn( ureg,

+                       translate_opcode( inst->Opcode ),

+                       src, num_src,

+                       get_label( t, inst->BranchTarget ));

+      return;

+

+   case OPCODE_TEX:

+   case OPCODE_TXB:

+   case OPCODE_TXD:

+   case OPCODE_TXL:

+   case OPCODE_TXP:

+      src[num_src++] = t->samplers[inst->TexSrcUnit];

+      ureg_tex_insn( ureg,

+                     translate_opcode( inst->Opcode ),

+                     dst, num_dst, 

+                     translate_texture_target( inst->TexSrcTarget,

+                                               inst->TexShadow ),

+                     src, num_src );

+      return;

+

+   case OPCODE_SCS:

+      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XY );

+      ureg_insn( ureg, 

+                 translate_opcode( inst->Opcode ), 

+                 dst, num_dst, 

+                 src, num_src );

+      break;

+

+   case OPCODE_XPD:

+      dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XYZ );

+      ureg_insn( ureg, 

+                 translate_opcode( inst->Opcode ), 

+                 dst, num_dst, 

+                 src, num_src );

+      break;

+

+   case OPCODE_NOISE1:

+   case OPCODE_NOISE2:

+   case OPCODE_NOISE3:

+   case OPCODE_NOISE4:

+      /* At some point, a motivated person could add a better

+       * implementation of noise.  Currently not even the nvidia

+       * binary drivers do anything more than this.  In any case, the

+       * place to do this is in the GL state tracker, not the poor

+       * driver.

+       */

+      ureg_MOV( ureg, dst[0], ureg_imm1f(ureg, 0.5) );

+      break;

+		 

+   case OPCODE_DDY:

+      emit_ddy( t, dst[0], &inst->SrcReg[0] );

+      break;

+

+   default:

+      ureg_insn( ureg, 

+                 translate_opcode( inst->Opcode ), 

+                 dst, num_dst, 

+                 src, num_src );

+      break;

+   }

+}

+

+

+/**

+ * Emit the TGSI instructions to adjust the WPOS pixel center convention

+ * Basically, add (adjX, adjY) to the fragment position.

+ */

+static void

+emit_adjusted_wpos( struct st_translate *t,

+                    const struct gl_program *program,

+                    GLfloat adjX, GLfloat adjY)

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_dst wpos_temp = ureg_DECL_temporary(ureg);

+   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];

+

+   /* Note that we bias X and Y and pass Z and W through unchanged.

+    * The shader might also use gl_FragCoord.w and .z.

+    */

+   ureg_ADD(ureg, wpos_temp, wpos_input,

+            ureg_imm4f(ureg, adjX, adjY, 0.0f, 0.0f));

+

+   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);

+}

+

+

+/**

+ * Emit the TGSI instructions for inverting the WPOS y coordinate.

+ * This code is unavoidable because it also depends on whether

+ * a FBO is bound (STATE_FB_WPOS_Y_TRANSFORM).

+ */

+static void

+emit_wpos_inversion( struct st_translate *t,

+                     const struct gl_program *program,

+                     boolean invert)

+{

+   struct ureg_program *ureg = t->ureg;

+

+   /* Fragment program uses fragment position input.

+    * Need to replace instances of INPUT[WPOS] with temp T

+    * where T = INPUT[WPOS] by y is inverted.

+    */

+   static const gl_state_index wposTransformState[STATE_LENGTH]

+      = { STATE_INTERNAL, STATE_FB_WPOS_Y_TRANSFORM, 0, 0, 0 };

+   

+   /* XXX: note we are modifying the incoming shader here!  Need to

+    * do this before emitting the constant decls below, or this

+    * will be missed:

+    */

+   unsigned wposTransConst = _mesa_add_state_reference(program->Parameters,

+                                                       wposTransformState);

+

+   struct ureg_src wpostrans = ureg_DECL_constant( ureg, wposTransConst );

+   struct ureg_dst wpos_temp;

+   struct ureg_src wpos_input = t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]];

+

+   /* MOV wpos_temp, input[wpos]

+    */

+   if (wpos_input.File == TGSI_FILE_TEMPORARY)

+      wpos_temp = ureg_dst(wpos_input);

+   else {

+      wpos_temp = ureg_DECL_temporary( ureg );

+      ureg_MOV( ureg, wpos_temp, wpos_input );

+   }

+

+   if (invert) {

+      /* MAD wpos_temp.y, wpos_input, wpostrans.xxxx, wpostrans.yyyy

+       */

+      ureg_MAD( ureg,

+                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),

+                wpos_input,

+                ureg_scalar(wpostrans, 0),

+                ureg_scalar(wpostrans, 1));

+   } else {

+      /* MAD wpos_temp.y, wpos_input, wpostrans.zzzz, wpostrans.wwww

+       */

+      ureg_MAD( ureg,

+                ureg_writemask(wpos_temp, TGSI_WRITEMASK_Y ),

+                wpos_input,

+                ureg_scalar(wpostrans, 2),

+                ureg_scalar(wpostrans, 3));

+   }

+

+   /* Use wpos_temp as position input from here on:

+    */

+   t->inputs[t->inputMapping[FRAG_ATTRIB_WPOS]] = ureg_src(wpos_temp);

+}

+

+

+/**

+ * Emit fragment position/ooordinate code.

+ */

+static void

+emit_wpos(struct st_context *st,

+          struct st_translate *t,

+          const struct gl_program *program,

+          struct ureg_program *ureg)

+{

+   const struct gl_fragment_program *fp =

+      (const struct gl_fragment_program *) program;

+   struct pipe_screen *pscreen = st->pipe->screen;

+   boolean invert = FALSE;

+

+   if (fp->OriginUpperLeft) {

+      /* Fragment shader wants origin in upper-left */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT)) {

+         /* the driver supports upper-left origin */

+      }

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) {

+         /* the driver supports lower-left origin, need to invert Y */

+         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);

+         invert = TRUE;

+      }

+      else

+         assert(0);

+   }

+   else {

+      /* Fragment shader wants origin in lower-left */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT))

+         /* the driver supports lower-left origin */

+         ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT);

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT))

+         /* the driver supports upper-left origin, need to invert Y */

+         invert = TRUE;

+      else

+         assert(0);

+   }

+   

+   if (fp->PixelCenterInteger) {

+      /* Fragment shader wants pixel center integer */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER))

+         /* the driver supports pixel center integer */

+         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER))

+         /* the driver supports pixel center half integer, need to bias X,Y */

+         emit_adjusted_wpos(t, program, 0.5f, invert ? 0.5f : -0.5f);

+      else

+         assert(0);

+   }

+   else {

+      /* Fragment shader wants pixel center half integer */

+      if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER)) {

+         /* the driver supports pixel center half integer */

+      }

+      else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) {

+         /* the driver supports pixel center integer, need to bias X,Y */

+         ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER);

+         emit_adjusted_wpos(t, program, 0.5f, invert ? -0.5f : 0.5f);

+      }

+      else

+         assert(0);

+   }

+

+   /* we invert after adjustment so that we avoid the MOV to temporary,

+    * and reuse the adjustment ADD instead */

+   emit_wpos_inversion(t, program, invert);

+}

+

+

+/**

+ * OpenGL's fragment gl_FrontFace input is 1 for front-facing, 0 for back.

+ * TGSI uses +1 for front, -1 for back.

+ * This function converts the TGSI value to the GL value.  Simply clamping/

+ * saturating the value to [0,1] does the job.

+ */

+static void

+emit_face_var( struct st_translate *t,

+               const struct gl_program *program )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_dst face_temp = ureg_DECL_temporary( ureg );

+   struct ureg_src face_input = t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]];

+

+   /* MOV_SAT face_temp, input[face]

+    */

+   face_temp = ureg_saturate( face_temp );

+   ureg_MOV( ureg, face_temp, face_input );

+

+   /* Use face_temp as face input from here on:

+    */

+   t->inputs[t->inputMapping[FRAG_ATTRIB_FACE]] = ureg_src(face_temp);

+}

+

+

+static void

+emit_edgeflags( struct st_translate *t,

+                 const struct gl_program *program )

+{

+   struct ureg_program *ureg = t->ureg;

+   struct ureg_dst edge_dst = t->outputs[t->outputMapping[VERT_RESULT_EDGE]];

+   struct ureg_src edge_src = t->inputs[t->inputMapping[VERT_ATTRIB_EDGEFLAG]];

+

+   ureg_MOV( ureg, edge_dst, edge_src );

+}

+

+

+/**

+ * Translate Mesa program to TGSI format.

+ * \param program  the program to translate

+ * \param numInputs  number of input registers used

+ * \param inputMapping  maps Mesa fragment program inputs to TGSI generic

+ *                      input indexes

+ * \param inputSemanticName  the TGSI_SEMANTIC flag for each input

+ * \param inputSemanticIndex  the semantic index (ex: which texcoord) for

+ *                            each input

+ * \param interpMode  the TGSI_INTERPOLATE_LINEAR/PERSP mode for each input

+ * \param numOutputs  number of output registers used

+ * \param outputMapping  maps Mesa fragment program outputs to TGSI

+ *                       generic outputs

+ * \param outputSemanticName  the TGSI_SEMANTIC flag for each output

+ * \param outputSemanticIndex  the semantic index (ex: which texcoord) for

+ *                             each output

+ *

+ * \return  PIPE_OK or PIPE_ERROR_OUT_OF_MEMORY

+ */

+enum pipe_error

+st_translate_mesa_program(

+   struct gl_context *ctx,

+   uint procType,

+   struct ureg_program *ureg,

+   const struct gl_program *program,

+   GLuint numInputs,

+   const GLuint inputMapping[],

+   const ubyte inputSemanticName[],

+   const ubyte inputSemanticIndex[],

+   const GLuint interpMode[],

+   GLuint numOutputs,

+   const GLuint outputMapping[],

+   const ubyte outputSemanticName[],

+   const ubyte outputSemanticIndex[],

+   boolean passthrough_edgeflags )

+{

+   struct st_translate translate, *t;

+   unsigned i;

+   enum pipe_error ret = PIPE_OK;

+

+   assert(numInputs <= Elements(t->inputs));

+   assert(numOutputs <= Elements(t->outputs));

+

+   t = &translate;

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

+

+   t->procType = procType;

+   t->inputMapping = inputMapping;

+   t->outputMapping = outputMapping;

+   t->ureg = ureg;

+   t->pointSizeOutIndex = -1;

+   t->prevInstWrotePointSize = GL_FALSE;

+

+   /*_mesa_print_program(program);*/

+

+   /*

+    * Declare input attributes.

+    */

+   if (procType == TGSI_PROCESSOR_FRAGMENT) {

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

+         if (program->InputFlags[0] & PROG_PARAM_BIT_CYL_WRAP) {

+            t->inputs[i] = ureg_DECL_fs_input_cyl(ureg,

+                                                  inputSemanticName[i],

+                                                  inputSemanticIndex[i],

+                                                  interpMode[i],

+                                                  TGSI_CYLINDRICAL_WRAP_X);

+         }

+         else {

+            t->inputs[i] = ureg_DECL_fs_input(ureg,

+                                              inputSemanticName[i],

+                                              inputSemanticIndex[i],

+                                              interpMode[i]);

+         }

+      }

+

+      if (program->InputsRead & FRAG_BIT_WPOS) {

+         /* Must do this after setting up t->inputs, and before

+          * emitting constant references, below:

+          */

+         emit_wpos(st_context(ctx), t, program, ureg);

+      }

+

+      if (program->InputsRead & FRAG_BIT_FACE) {

+         emit_face_var( t, program );

+      }

+

+      /*

+       * Declare output attributes.

+       */

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

+         switch (outputSemanticName[i]) {

+         case TGSI_SEMANTIC_POSITION:

+            t->outputs[i] = ureg_DECL_output( ureg,

+                                              TGSI_SEMANTIC_POSITION, /* Z / Depth */

+                                              outputSemanticIndex[i] );

+

+            t->outputs[i] = ureg_writemask( t->outputs[i],

+                                            TGSI_WRITEMASK_Z );

+            break;

+         case TGSI_SEMANTIC_STENCIL:

+            t->outputs[i] = ureg_DECL_output( ureg,

+                                              TGSI_SEMANTIC_STENCIL, /* Stencil */

+                                              outputSemanticIndex[i] );

+            t->outputs[i] = ureg_writemask( t->outputs[i],

+                                            TGSI_WRITEMASK_Y );

+            break;

+         case TGSI_SEMANTIC_COLOR:

+            t->outputs[i] = ureg_DECL_output( ureg,

+                                              TGSI_SEMANTIC_COLOR,

+                                              outputSemanticIndex[i] );

+            break;

+         default:

+            debug_assert(0);

+            return 0;

+         }

+      }

+   }

+   else if (procType == TGSI_PROCESSOR_GEOMETRY) {

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

+         t->inputs[i] = ureg_DECL_gs_input(ureg,

+                                           i,

+                                           inputSemanticName[i],

+                                           inputSemanticIndex[i]);

+      }

+

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

+         t->outputs[i] = ureg_DECL_output( ureg,

+                                           outputSemanticName[i],

+                                           outputSemanticIndex[i] );

+      }

+   }

+   else {

+      assert(procType == TGSI_PROCESSOR_VERTEX);

+

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

+         t->inputs[i] = ureg_DECL_vs_input(ureg, i);

+      }

+

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

+         t->outputs[i] = ureg_DECL_output( ureg,

+                                           outputSemanticName[i],

+                                           outputSemanticIndex[i] );

+         if ((outputSemanticName[i] == TGSI_SEMANTIC_PSIZE) && program->Id) {

+            /* Writing to the point size result register requires special

+             * handling to implement clamping.

+             */

+            static const gl_state_index pointSizeClampState[STATE_LENGTH]

+               = { STATE_INTERNAL, STATE_POINT_SIZE_IMPL_CLAMP, 0, 0, 0 };

+               /* XXX: note we are modifying the incoming shader here!  Need to

+               * do this before emitting the constant decls below, or this

+               * will be missed:

+               */

+            unsigned pointSizeClampConst =

+               _mesa_add_state_reference(program->Parameters,

+                                         pointSizeClampState);

+            struct ureg_dst psizregtemp = ureg_DECL_temporary( ureg );

+            t->pointSizeConst = ureg_DECL_constant( ureg, pointSizeClampConst );

+            t->pointSizeResult = t->outputs[i];

+            t->pointSizeOutIndex = i;

+            t->outputs[i] = psizregtemp;

+         }

+      }

+      if (passthrough_edgeflags)

+         emit_edgeflags( t, program );

+   }

+

+   /* Declare address register.

+    */

+   if (program->NumAddressRegs > 0) {

+      debug_assert( program->NumAddressRegs == 1 );

+      t->address[0] = ureg_DECL_address( ureg );

+   }

+

+   /* Declare misc input registers

+    */

+   {

+      GLbitfield sysInputs = program->SystemValuesRead;

+      unsigned numSys = 0;

+      for (i = 0; sysInputs; i++) {

+         if (sysInputs & (1 << i)) {

+            unsigned semName = mesa_sysval_to_semantic[i];

+            t->systemValues[i] = ureg_DECL_system_value(ureg, numSys, semName, 0);

+            numSys++;

+            sysInputs &= ~(1 << i);

+         }

+      }

+   }

+

+   if (program->IndirectRegisterFiles & (1 << PROGRAM_TEMPORARY)) {

+      /* If temps are accessed with indirect addressing, declare temporaries

+       * in sequential order.  Else, we declare them on demand elsewhere.

+       */

+      for (i = 0; i < program->NumTemporaries; i++) {

+         /* XXX use TGSI_FILE_TEMPORARY_ARRAY when it's supported by ureg */

+         t->temps[i] = ureg_DECL_temporary( t->ureg );

+      }

+   }

+

+   /* Emit constants and immediates.  Mesa uses a single index space

+    * for these, so we put all the translated regs in t->constants.

+    */

+   if (program->Parameters) {

+      t->constants = CALLOC( program->Parameters->NumParameters,

+                             sizeof t->constants[0] );

+      if (t->constants == NULL) {

+         ret = PIPE_ERROR_OUT_OF_MEMORY;

+         goto out;

+      }

+

+      for (i = 0; i < program->Parameters->NumParameters; i++) {

+         switch (program->Parameters->Parameters[i].Type) {

+         case PROGRAM_ENV_PARAM:

+         case PROGRAM_LOCAL_PARAM:

+         case PROGRAM_STATE_VAR:

+         case PROGRAM_NAMED_PARAM:

+         case PROGRAM_UNIFORM:

+            t->constants[i] = ureg_DECL_constant( ureg, i );

+            break;

+

+            /* Emit immediates only when there's no indirect addressing of

+             * the const buffer.

+             * FIXME: Be smarter and recognize param arrays:

+             * indirect addressing is only valid within the referenced

+             * array.

+             */

+         case PROGRAM_CONSTANT:

+            if (program->IndirectRegisterFiles & PROGRAM_ANY_CONST)

+               t->constants[i] = ureg_DECL_constant( ureg, i );

+            else

+               t->constants[i] = 

+                  ureg_DECL_immediate( ureg,

+                                       program->Parameters->ParameterValues[i],

+                                       4 );

+            break;

+         default:

+            break;

+         }

+      }

+   }

+

+   /* texture samplers */

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

+      if (program->SamplersUsed & (1 << i)) {

+         t->samplers[i] = ureg_DECL_sampler( ureg, i );

+      }

+   }

+

+   /* Emit each instruction in turn:

+    */

+   for (i = 0; i < program->NumInstructions; i++) {

+      set_insn_start( t, ureg_get_instruction_number( ureg ));

+      compile_instruction( t, &program->Instructions[i] );

+

+      if (t->prevInstWrotePointSize && program->Id) {

+         /* The previous instruction wrote to the (fake) vertex point size

+          * result register.  Now we need to clamp that value to the min/max

+          * point size range, putting the result into the real point size

+          * register.

+          * Note that we can't do this easily at the end of program due to

+          * possible early return.

+          */

+         set_insn_start( t, ureg_get_instruction_number( ureg ));

+         ureg_MAX( t->ureg,

+                   ureg_writemask(t->outputs[t->pointSizeOutIndex], WRITEMASK_X),

+                   ureg_src(t->outputs[t->pointSizeOutIndex]),

+                   ureg_swizzle(t->pointSizeConst, 1,1,1,1));

+         ureg_MIN( t->ureg, ureg_writemask(t->pointSizeResult, WRITEMASK_X),

+                   ureg_src(t->outputs[t->pointSizeOutIndex]),

+                   ureg_swizzle(t->pointSizeConst, 2,2,2,2));

+      }

+      t->prevInstWrotePointSize = GL_FALSE;

+   }

+

+   /* Fix up all emitted labels:

+    */

+   for (i = 0; i < t->labels_count; i++) {

+      ureg_fixup_label( ureg,

+                        t->labels[i].token,

+                        t->insn[t->labels[i].branch_target] );

+   }

+

+out:

+   FREE(t->insn);

+   FREE(t->labels);

+   FREE(t->constants);

+

+   if (t->error) {

+      debug_printf("%s: translate error flag set\n", __FUNCTION__);

+   }

+

+   return ret;

+}

+

+

+/**

+ * Tokens cannot be free with free otherwise the builtin gallium

+ * malloc debugging will get confused.

+ */

+void

+st_free_tokens(const struct tgsi_token *tokens)

+{

+   FREE((void *)tokens);

+}

diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index ac9771eb8..d8d10df91 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -296,6 +296,7 @@
     <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c" />

     <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c" />

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 41acdbe4e..d02f4a0a1 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.

 

 AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.9.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="2011-2-24"

+AC_INIT([xorg-server], 1.10.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

+RELEASE_DATE="2011-2-25"

 AC_CONFIG_SRCDIR([Makefile.am])

 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AM_MAINTAINER_MODE

@@ -2173,6 +2173,8 @@ AC_SUBST([libdir])
 AC_SUBST([exec_prefix])

 AC_SUBST([prefix])

 

+AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/loader/sdksyms.dep])

+

 AC_OUTPUT([

 Makefile

 glx/Makefile

@@ -2246,6 +2248,7 @@ hw/xfree86/utils/gtf/Makefile
 hw/dmx/config/Makefile

 hw/dmx/config/man/Makefile

 hw/dmx/doc/Makefile

+hw/dmx/doc/doxygen.conf

 hw/dmx/examples/Makefile

 hw/dmx/input/Makefile

 hw/dmx/glxProxy/Makefile

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 1bf73b992..1c2cc9807 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -1233,6 +1233,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
 {

     int i;

     ValuatorClassPtr valc;

+    union align_u { ValuatorClassRec valc; double d; } *align;

 

     if (!dev)

         return FALSE;

@@ -1245,12 +1246,13 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
         numAxes = MAX_VALUATORS;

     }

 

-    valc = (ValuatorClassPtr)calloc(1, sizeof(ValuatorClassRec) +

-				    numAxes * sizeof(AxisInfo) +

-				    numAxes * sizeof(double));

-    if (!valc)

+    align = (union align_u *) calloc(1, sizeof(union align_u) +

+				     numAxes * sizeof(double) +

+				     numAxes * sizeof(AxisInfo));

+    if (!align)

 	return FALSE;

 

+    valc = &align->valc;

     valc->sourceid = dev->id;

     valc->motion = NULL;

     valc->first_motion = 0;

@@ -1259,8 +1261,8 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
     valc->numMotionEvents = numMotionEvents;

     valc->motionHintWindow = NullWindow;

     valc->numAxes = numAxes;

-    valc->axes = (AxisInfoPtr)(valc + 1);

-    valc->axisVal = (double *)(valc->axes + numAxes);

+    valc->axisVal = (double *)(align + 1);

+    valc->axes = (AxisInfoPtr)(valc->axisVal + numAxes);

 

     if (mode & OutOfProximity)

         InitProximityClassDeviceStruct(dev);

diff --git a/xorg-server/hw/dmx/doc/Makefile.am b/xorg-server/hw/dmx/doc/Makefile.am
index 4bbc8bf88..2c5350bd9 100644
--- a/xorg-server/hw/dmx/doc/Makefile.am
+++ b/xorg-server/hw/dmx/doc/Makefile.am
@@ -1,265 +1,280 @@
-#  Copyright 2005 Red Hat, Inc.
-#
-#  Permission to use, copy, modify, distribute, and sell this software
-#  and its documentation for any purpose is hereby granted without
-#  fee, 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 Red Hat
-#  not be used in advertising or publicity pertaining to distribution
-#  of the software without specific, written prior permission.  Red
-#  Hat makes no representations about the suitability of this software
-#  for any purpose.  It is provided "as is" without express or implied
-#  warranty.
-#
-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-#  NO EVENT SHALL RED HAT 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.
-
-doc_sources = dmx.xml scaled.xml
-
-# Developer's documentation is not installed
-if ENABLE_DEVEL_DOCS
-include $(top_srcdir)/doc/xml/xmlrules-noinst.in
-
-if HAVE_DOXYGEN
-
-DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf
-
-all-local: html/annotated.html
-
-dist-local: html/annotated.html
-
-html/annotated.html: $(DOXYGEN_SRC)
-	$(DOXYGEN) $(srcdir)/doxygen.conf
-
-maintainer-clean-local:
-	rm -rf html/
-endif
-endif ENABLE_DEVEL_DOCS
-
-EXTRA_DIST = \
-	$(XML_FILES) \
-	DMXSpec.txt \
-	DMXSpec-v1.txt \
-	dmx.txt \
-	doxygen.conf \
-	doxygen.css \
-	doxygen.foot \
-	doxygen.head \
-	scaled.txt \
-	html/annotated.html \
-	html/ChkNotMaskEv_8c.html \
-	html/ChkNotMaskEv_8h.html \
-	html/ChkNotMaskEv_8h_source.html \
-	html/classes.html \
-	html/dmx_8h.html \
-	html/dmx_8h_source.html \
-	html/dmxarg_8c.html \
-	html/dmxarg_8h.html \
-	html/dmxarg_8h_source.html \
-	html/dmxbackend_8c.html \
-	html/dmxbackend_8h.html \
-	html/dmxbackend_8h_source.html \
-	html/dmxcb_8c.html \
-	html/dmxcb_8h.html \
-	html/dmxcb_8h_source.html \
-	html/dmxclient_8h.html \
-	html/dmxclient_8h_source.html \
-	html/dmxcmap_8c.html \
-	html/dmxcmap_8h.html \
-	html/dmxcmap_8h_source.html \
-	html/dmxcommon_8c.html \
-	html/dmxcommon_8h.html \
-	html/dmxcommon_8h_source.html \
-	html/dmxcompat_8c.html \
-	html/dmxcompat_8h.html \
-	html/dmxcompat_8h_source.html \
-	html/dmxconfig_8c.html \
-	html/dmxconfig_8h.html \
-	html/dmxconfig_8h_source.html \
-	html/dmxconsole_8c.html \
-	html/dmxconsole_8h.html \
-	html/dmxconsole_8h_source.html \
-	html/dmxcursor_8c.html \
-	html/dmxcursor_8h.html \
-	html/dmxcursor_8h_source.html \
-	html/dmxdetach_8c.html \
-	html/dmxdpms_8c.html \
-	html/dmxdpms_8h.html \
-	html/dmxdpms_8h_source.html \
-	html/dmxdummy_8c.html \
-	html/dmxdummy_8h.html \
-	html/dmxdummy_8h_source.html \
-	html/dmxevents_8c.html \
-	html/dmxevents_8h.html \
-	html/dmxevents_8h_source.html \
-	html/dmxextension_8c.html \
-	html/dmxextension_8h.html \
-	html/dmxextension_8h_source.html \
-	html/dmxfont_8c.html \
-	html/dmxfont_8h.html \
-	html/dmxfont_8h_source.html \
-	html/dmxgc_8c.html \
-	html/dmxgc_8h.html \
-	html/dmxgc_8h_source.html \
-	html/dmxgcops_8c.html \
-	html/dmxgcops_8h.html \
-	html/dmxgcops_8h_source.html \
-	html/dmx__glxvisuals_8h_source.html \
-	html/dmxinit_8c.html \
-	html/dmxinit_8h.html \
-	html/dmxinit_8h_source.html \
-	html/dmxinput_8c.html \
-	html/dmxinput_8h.html \
-	html/dmxinput_8h_source.html \
-	html/dmxinputinit_8c.html \
-	html/dmxinputinit_8h.html \
-	html/dmxinputinit_8h_source.html \
-	html/dmxlog_8c.html \
-	html/dmxlog_8h.html \
-	html/dmxlog_8h_source.html \
-	html/dmxmap_8c.html \
-	html/dmxmap_8h.html \
-	html/dmxmap_8h_source.html \
-	html/dmxmotion_8c.html \
-	html/dmxmotion_8h.html \
-	html/dmxmotion_8h_source.html \
-	html/dmxparse_8c.html \
-	html/dmxparse_8h.html \
-	html/dmxparse_8h_source.html \
-	html/dmxpict_8c.html \
-	html/dmxpict_8h.html \
-	html/dmxpict_8h_source.html \
-	html/dmxpixmap_8c.html \
-	html/dmxpixmap_8h.html \
-	html/dmxpixmap_8h_source.html \
-	html/dmxprint_8c.html \
-	html/dmxprint_8h.html \
-	html/dmxprint_8h_source.html \
-	html/dmxprop_8c.html \
-	html/dmxprop_8h.html \
-	html/dmxprop_8h_source.html \
-	html/dmxscrinit_8c.html \
-	html/dmxscrinit_8h.html \
-	html/dmxscrinit_8h_source.html \
-	html/dmxshadow_8c.html \
-	html/dmxshadow_8h.html \
-	html/dmxshadow_8h_source.html \
-	html/dmxsigio_8c.html \
-	html/dmxsigio_8h.html \
-	html/dmxsigio_8h_source.html \
-	html/dmxstat_8c.html \
-	html/dmxstat_8h.html \
-	html/dmxstat_8h_source.html \
-	html/dmxsync_8c.html \
-	html/dmxsync_8h.html \
-	html/dmxsync_8h_source.html \
-	html/dmxvisual_8c.html \
-	html/dmxvisual_8h.html \
-	html/dmxvisual_8h_source.html \
-	html/dmxwindow_8c.html \
-	html/dmxwindow_8h.html \
-	html/dmxwindow_8h_source.html \
-	html/dmxxinput_8c.html \
-	html/doxygen.css \
-	html/doxygen.png \
-	html/files.html \
-	html/ftv2blank.png \
-	html/ftv2doc.png \
-	html/ftv2folderclosed.png \
-	html/ftv2folderopen.png \
-	html/ftv2lastnode.png \
-	html/ftv2link.png \
-	html/ftv2mlastnode.png \
-	html/ftv2mnode.png \
-	html/ftv2node.png \
-	html/ftv2plastnode.png \
-	html/ftv2pnode.png \
-	html/ftv2vertline.png \
-	html/functions.html \
-	html/functions_vars.html \
-	html/globals_defs.html \
-	html/globals_enum.html \
-	html/globals_eval.html \
-	html/globals_func.html \
-	html/globals.html \
-	html/globals_type.html \
-	html/globals_vars.html \
-	html/index.html \
-	html/lnx-keyboard_8c.html \
-	html/lnx-keyboard_8h.html \
-	html/lnx-keyboard_8h_source.html \
-	html/lnx-ms_8c.html \
-	html/lnx-ms_8h.html \
-	html/lnx-ms_8h_source.html \
-	html/lnx-ps2_8c.html \
-	html/lnx-ps2_8h.html \
-	html/lnx-ps2_8h_source.html \
-	html/main.html \
-	html/struct__dmxArg.html \
-	html/struct__dmxColormapPriv.html \
-	html/structDMXConfigCmdStruct.html \
-	html/struct__DMXConfigComment.html \
-	html/struct__DMXConfigDisplay.html \
-	html/struct__DMXConfigEntry.html \
-	html/struct__DMXConfigFullDim.html \
-	html/structDMXConfigListStruct.html \
-	html/struct__DMXConfigNumber.html \
-	html/struct__DMXConfigOption.html \
-	html/struct__DMXConfigPair.html \
-	html/struct__DMXConfigParam.html \
-	html/struct__DMXConfigPartDim.html \
-	html/struct__DMXConfigString.html \
-	html/struct__DMXConfigSub.html \
-	html/struct__DMXConfigToken.html \
-	html/struct__DMXConfigVirtual.html \
-	html/struct__DMXConfigWall.html \
-	html/struct__dmxCursorPriv.html \
-	html/structDMXDesktopAttributesRec.html \
-	html/struct__DMXEventMap.html \
-	html/struct__dmxFontPriv.html \
-	html/struct__dmxGCPriv.html \
-	html/structdmxGlxVisualPrivate.html \
-	html/struct__dmxGlyphPriv.html \
-	html/structDMXInputAttributesRec.html \
-	html/struct__DMXInputInfo.html \
-	html/struct__DMXLocalInitInfo.html \
-	html/struct__DMXLocalInputInfo.html \
-	html/struct__dmxPictPriv.html \
-	html/struct__dmxPixPriv.html \
-	html/structDMXScreenAttributesRec.html \
-	html/struct__DMXScreenInfo.html \
-	html/struct__DMXStatAvg.html \
-	html/struct__DMXStatInfo.html \
-	html/structDMXWindowAttributesRec.html \
-	html/struct__dmxWinPriv.html \
-	html/struct__myPrivate.html \
-	html/tree.html \
-	html/usb-common_8c.html \
-	html/usb-common_8h.html \
-	html/usb-common_8h_source.html \
-	html/usb-keyboard_8c.html \
-	html/usb-keyboard_8h.html \
-	html/usb-keyboard_8h_source.html \
-	html/usb-mouse_8c.html \
-	html/usb-mouse_8h.html \
-	html/usb-mouse_8h_source.html \
-	html/usb-other_8c.html \
-	html/usb-other_8h.html \
-	html/usb-other_8h_source.html \
-	html/usb-private_8h.html \
-	html/usb-private_8h_source.html
-
-$(builddir)/doxygen.head:
-	$(LN_S) $(srcdir)/doxygen.head $@
-
-$(builddir)/doxygen.foot:
-	$(LN_S) $(srcdir)/doxygen.foot $@
-
-$(builddir)doxygen.css:
-	$(LN_S) $(srcdir)/doxygen.css $@
-
+#  Copyright 2005 Red Hat, Inc.

+#

+#  Permission to use, copy, modify, distribute, and sell this software

+#  and its documentation for any purpose is hereby granted without

+#  fee, 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 Red Hat

+#  not be used in advertising or publicity pertaining to distribution

+#  of the software without specific, written prior permission.  Red

+#  Hat makes no representations about the suitability of this software

+#  for any purpose.  It is provided "as is" without express or implied

+#  warranty.

+#

+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

+#  NO EVENT SHALL RED HAT 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.

+

+doc_sources = dmx.xml scaled.xml

+

+# Developer's documentation is not installed

+if ENABLE_DEVEL_DOCS

+include $(top_srcdir)/doc/xml/xmlrules-noinst.in

+endif ENABLE_DEVEL_DOCS

+

+DOXYGEN_HEAD=\

+	html/annotated.html

+

+DOXYGEN_REST= \

+	dmx.txt \

+	scaled.txt \

+	html/ChkNotMaskEv_8c.html \

+	html/ChkNotMaskEv_8h.html \

+	html/ChkNotMaskEv_8h_source.html \

+	html/classes.html \

+	html/dmx_8h.html \

+	html/dmx_8h_source.html \

+	html/dmxarg_8c.html \

+	html/dmxarg_8h.html \

+	html/dmxarg_8h_source.html \

+	html/dmxbackend_8c.html \

+	html/dmxbackend_8h.html \

+	html/dmxbackend_8h_source.html \

+	html/dmxcb_8c.html \

+	html/dmxcb_8h.html \

+	html/dmxcb_8h_source.html \

+	html/dmxclient_8h.html \

+	html/dmxclient_8h_source.html \

+	html/dmxcmap_8c.html \

+	html/dmxcmap_8h.html \

+	html/dmxcmap_8h_source.html \

+	html/dmxcommon_8c.html \

+	html/dmxcommon_8h.html \

+	html/dmxcommon_8h_source.html \

+	html/dmxcompat_8c.html \

+	html/dmxcompat_8h.html \

+	html/dmxcompat_8h_source.html \

+	html/dmxconfig_8c.html \

+	html/dmxconfig_8h.html \

+	html/dmxconfig_8h_source.html \

+	html/dmxconsole_8c.html \

+	html/dmxconsole_8h.html \

+	html/dmxconsole_8h_source.html \

+	html/dmxcursor_8c.html \

+	html/dmxcursor_8h.html \

+	html/dmxcursor_8h_source.html \

+	html/dmxdetach_8c.html \

+	html/dmxdpms_8c.html \

+	html/dmxdpms_8h.html \

+	html/dmxdpms_8h_source.html \

+	html/dmxdummy_8c.html \

+	html/dmxdummy_8h.html \

+	html/dmxdummy_8h_source.html \

+	html/dmxevents_8c.html \

+	html/dmxevents_8h.html \

+	html/dmxevents_8h_source.html \

+	html/dmxextension_8c.html \

+	html/dmxextension_8h.html \

+	html/dmxextension_8h_source.html \

+	html/dmxfont_8c.html \

+	html/dmxfont_8h.html \

+	html/dmxfont_8h_source.html \

+	html/dmxgc_8c.html \

+	html/dmxgc_8h.html \

+	html/dmxgc_8h_source.html \

+	html/dmxgcops_8c.html \

+	html/dmxgcops_8h.html \

+	html/dmxgcops_8h_source.html \

+	html/dmx__glxvisuals_8h_source.html \

+	html/dmxinit_8c.html \

+	html/dmxinit_8h.html \

+	html/dmxinit_8h_source.html \

+	html/dmxinput_8c.html \

+	html/dmxinput_8h.html \

+	html/dmxinput_8h_source.html \

+	html/dmxinputinit_8c.html \

+	html/dmxinputinit_8h.html \

+	html/dmxinputinit_8h_source.html \

+	html/dmxlog_8c.html \

+	html/dmxlog_8h.html \

+	html/dmxlog_8h_source.html \

+	html/dmxmap_8c.html \

+	html/dmxmap_8h.html \

+	html/dmxmap_8h_source.html \

+	html/dmxmotion_8c.html \

+	html/dmxmotion_8h.html \

+	html/dmxmotion_8h_source.html \

+	html/dmxparse_8c.html \

+	html/dmxparse_8h.html \

+	html/dmxparse_8h_source.html \

+	html/dmxpict_8c.html \

+	html/dmxpict_8h.html \

+	html/dmxpict_8h_source.html \

+	html/dmxpixmap_8c.html \

+	html/dmxpixmap_8h.html \

+	html/dmxpixmap_8h_source.html \

+	html/dmxprint_8c.html \

+	html/dmxprint_8h.html \

+	html/dmxprint_8h_source.html \

+	html/dmxprop_8c.html \

+	html/dmxprop_8h.html \

+	html/dmxprop_8h_source.html \

+	html/dmxscrinit_8c.html \

+	html/dmxscrinit_8h.html \

+	html/dmxscrinit_8h_source.html \

+	html/dmxshadow_8c.html \

+	html/dmxshadow_8h.html \

+	html/dmxshadow_8h_source.html \

+	html/dmxsigio_8c.html \

+	html/dmxsigio_8h.html \

+	html/dmxsigio_8h_source.html \

+	html/dmxstat_8c.html \

+	html/dmxstat_8h.html \

+	html/dmxstat_8h_source.html \

+	html/dmxsync_8c.html \

+	html/dmxsync_8h.html \

+	html/dmxsync_8h_source.html \

+	html/dmxvisual_8c.html \

+	html/dmxvisual_8h.html \

+	html/dmxvisual_8h_source.html \

+	html/dmxwindow_8c.html \

+	html/dmxwindow_8h.html \

+	html/dmxwindow_8h_source.html \

+	html/dmxxinput_8c.html \

+	html/doxygen.css \

+	html/doxygen.png \

+	html/files.html \

+	html/ftv2blank.png \

+	html/ftv2doc.png \

+	html/ftv2folderclosed.png \

+	html/ftv2folderopen.png \

+	html/ftv2lastnode.png \

+	html/ftv2link.png \

+	html/ftv2mlastnode.png \

+	html/ftv2mnode.png \

+	html/ftv2node.png \

+	html/ftv2plastnode.png \

+	html/ftv2pnode.png \

+	html/ftv2vertline.png \

+	html/functions.html \

+	html/functions_vars.html \

+	html/globals_defs.html \

+	html/globals_enum.html \

+	html/globals_eval.html \

+	html/globals_func.html \

+	html/globals.html \

+	html/globals_type.html \

+	html/globals_vars.html \

+	html/index.html \

+	html/lnx-keyboard_8c.html \

+	html/lnx-keyboard_8h.html \

+	html/lnx-keyboard_8h_source.html \

+	html/lnx-ms_8c.html \

+	html/lnx-ms_8h.html \

+	html/lnx-ms_8h_source.html \

+	html/lnx-ps2_8c.html \

+	html/lnx-ps2_8h.html \

+	html/lnx-ps2_8h_source.html \

+	html/main.html \

+	html/struct__dmxArg.html \

+	html/struct__dmxColormapPriv.html \

+	html/structDMXConfigCmdStruct.html \

+	html/struct__DMXConfigComment.html \

+	html/struct__DMXConfigDisplay.html \

+	html/struct__DMXConfigEntry.html \

+	html/struct__DMXConfigFullDim.html \

+	html/structDMXConfigListStruct.html \

+	html/struct__DMXConfigNumber.html \

+	html/struct__DMXConfigOption.html \

+	html/struct__DMXConfigPair.html \

+	html/struct__DMXConfigParam.html \

+	html/struct__DMXConfigPartDim.html \

+	html/struct__DMXConfigString.html \

+	html/struct__DMXConfigSub.html \

+	html/struct__DMXConfigToken.html \

+	html/struct__DMXConfigVirtual.html \

+	html/struct__DMXConfigWall.html \

+	html/struct__dmxCursorPriv.html \

+	html/structDMXDesktopAttributesRec.html \

+	html/struct__DMXEventMap.html \

+	html/struct__dmxFontPriv.html \

+	html/struct__dmxGCPriv.html \

+	html/structdmxGlxVisualPrivate.html \

+	html/struct__dmxGlyphPriv.html \

+	html/structDMXInputAttributesRec.html \

+	html/struct__DMXInputInfo.html \

+	html/struct__DMXLocalInitInfo.html \

+	html/struct__DMXLocalInputInfo.html \

+	html/struct__dmxPictPriv.html \

+	html/struct__dmxPixPriv.html \

+	html/structDMXScreenAttributesRec.html \

+	html/struct__DMXScreenInfo.html \

+	html/struct__DMXStatAvg.html \

+	html/struct__DMXStatInfo.html \

+	html/structDMXWindowAttributesRec.html \

+	html/struct__dmxWinPriv.html \

+	html/struct__myPrivate.html \

+	html/tree.html \

+	html/usb-common_8c.html \

+	html/usb-common_8h.html \

+	html/usb-common_8h_source.html \

+	html/usb-keyboard_8c.html \

+	html/usb-keyboard_8h.html \

+	html/usb-keyboard_8h_source.html \

+	html/usb-mouse_8c.html \

+	html/usb-mouse_8h.html \

+	html/usb-mouse_8h_source.html \

+	html/usb-other_8c.html \

+	html/usb-other_8h.html \

+	html/usb-other_8h_source.html \

+	html/usb-private_8h.html \

+	html/usb-private_8h_source.html

+

+DOXYGEN_FILES=$(DOXYGEN_HEAD) $(DOXYGEN_REST)

+

+EXTRA_DIST = \

+	$(XML_FILES) \

+	DMXSpec.txt \

+	DMXSpec-v1.txt \

+	doxygen.conf \

+	doxygen.css \

+	doxygen.foot \

+	doxygen.head \

+	$(DOXYGEN_FILES)

+

+if ENABLE_DEVEL_DOCS

+if HAVE_DOXYGEN

+

+DOXYGEN_SRC=doxygen.head doxygen.foot doxygen.css doxygen.conf

+

+all-local: $(DOXYGEN_FILES)

+

+dist-local: $(DOXYGEN_FILES)

+

+$(DOXYGEN_HEAD): $(DOXYGEN_SRC)

+	$(DOXYGEN) doxygen.conf

+

+$(DOXYGEN_REST): $(DOXYGEN_HEAD)

+

+maintainer-clean-local:

+	rm -rf html/ scaled.txt dmx.txt

+

+distclean-local:

+	rm -rf html/ scaled.txt dmx.txt

+

+endif HAVE_DOXYGEN

+endif ENABLE_DEVEL_DOCS

+

+$(builddir)/doxygen.head:

+	$(LN_S) $(srcdir)/doxygen.head $@

+

+$(builddir)/doxygen.foot:

+	$(LN_S) $(srcdir)/doxygen.foot $@

+

+$(builddir)doxygen.css:

+	$(LN_S) $(srcdir)/doxygen.css $@

+

diff --git a/xorg-server/hw/dmx/doc/doxygen.conf b/xorg-server/hw/dmx/doc/doxygen.conf.in
index f7a541f90..f886a436f 100644
--- a/xorg-server/hw/dmx/doc/doxygen.conf
+++ b/xorg-server/hw/dmx/doc/doxygen.conf.in
@@ -344,9 +344,9 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = .. \
-                         ../input \
-                         ../config
+INPUT                  = @srcdir@/.. \
+                         @srcdir@/../input \
+                         @srcdir@/../config
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -367,9 +367,9 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ../config/parser.c \
-                         ../config/parser.h \
-                         ../config/scanner.c
+EXCLUDE                = @srcdir@/../config/parser.c \
+                         @srcdir@/../config/parser.h \
+                         @srcdir@/../config/scanner.c
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
 # that are symbolic links (a Unix filesystem feature) are excluded from the input.
@@ -510,20 +510,20 @@ HTML_FILE_EXTENSION    = .html
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER            = doxygen.head
+HTML_HEADER            = @srcdir@/doxygen.head
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = doxygen.foot
+HTML_FOOTER            = @srcdir@/doxygen.foot
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet
 
-HTML_STYLESHEET        = doxygen.css
+HTML_STYLESHEET        = @srcdir@/doxygen.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
diff --git a/xorg-server/hw/xfree86/loader/Makefile.am b/xorg-server/hw/xfree86/loader/Makefile.am
index acacda650..8045885b1 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.am
+++ b/xorg-server/hw/xfree86/loader/Makefile.am
@@ -26,4 +26,5 @@ CLEANFILES = sdksyms.c sdksyms.dep
 sdksyms.dep sdksyms.c: sdksyms.sh

 	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)

 

-sinclude sdksyms.dep

+SDKSYMS_DEP = sdksyms.dep

+include $(SDKSYMS_DEP)

diff --git a/xorg-server/hw/xwin/glx/Makefile.am b/xorg-server/hw/xwin/glx/Makefile.am
index dae58bf89..94ebbb828 100644
--- a/xorg-server/hw/xwin/glx/Makefile.am
+++ b/xorg-server/hw/xwin/glx/Makefile.am
@@ -45,10 +45,10 @@ wgl.tm:
 	wget http://www.opengl.org/registry/api/wgl.tm

 

 generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/gl.spec --typemap=$(srcdir)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c

+	$(srcdir)/gen_gl_wrappers.py --spec=`test -e gl.spec || echo $(srcdir)/`gl.spec --typemap=`test -e gl.tm || echo $(srcdir)/`gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c

 

 generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm

-	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/wglext.spec --typemap=$(srcdir)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c

+	$(srcdir)/gen_gl_wrappers.py --spec=`test -e wglext.spec || echo $(srcdir)/`wglext.spec --typemap=`test -e wgl.tm || echo $(srcdir)/`wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c

 

 wglext.h:

 	wget http://www.opengl.org/registry/api/wglext.h

diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 00634858d..fc01ea82e 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -60,6 +60,7 @@
   caps:super		=	+capslock(super)

   caps:hyper		=	+capslock(hyper)

   caps:none		=	+capslock(none)

+  caps:ctrl_modifier	=	+capslock(ctrl_modifier)

   ctrl:nocaps		=	+ctrl(nocaps)

   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)

   ctrl:swapcaps		=	+ctrl(swapcaps)

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index d6061b0ec..37e7a56d4 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1394,14 +1394,14 @@
         </variant>

         <variant>

           <configItem>

-            <name>olpc-fa</name>

+            <name>fa-olpc</name>

             <_description>OLPC Dari</_description>

             <!-- No ISO code in ISO639-2, only draft ISO693-3 -->

           </configItem>

         </variant>

         <variant>

           <configItem>

-            <name>olpc-uz</name>

+            <name>uz-olpc</name>

             <_description>OLPC Southern Uzbek</_description>

             <languageList><iso639Id>uzb</iso639Id></languageList>

           </configItem>

@@ -5295,6 +5295,12 @@
           <_description>Caps Lock is disabled</_description>

         </configItem>

       </option>

+      <option>

+        <configItem>

+          <name>caps:ctrl_modifier</name>

+          <_description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</_description>

+        </configItem>

+      </option>

     </group>

     <group allowMultipleSelection="false">

       <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->

diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index 90bfe127d..691b0a07c 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -275,7 +275,7 @@ xkb_symbols "olpc-ps" {
 };

 

 partial alphanumeric_keys 

-xkb_symbols "olpc-fa" {

+xkb_symbols "fa-olpc" {

 

    name[Group1]= "Afghanistan - OLPC Dari";

 

@@ -336,7 +336,7 @@ xkb_symbols "olpc-fa" {
 };

 

 partial alphanumeric_keys 

-xkb_symbols "olpc-uz" {

+xkb_symbols "uz-olpc" {

 

    name[Group1]= "Afghanistan - OLPC Southern Uzbek";

 

diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 288a1d293..6daf5c1ed 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -60,3 +60,15 @@ partial hidden modifier_keys
 xkb_symbols "numlock" {

     key <CAPS> {        [       Num_Lock  ]       };

 };

+

+// This changes the modifier behavior of the <CAPS> key.

+// The keysym will be reset to Caps_Lock

+partial hidden modifier_keys

+xkb_symbols "ctrl_modifier" {

+    replace key <CAPS> {

+        type[Group1] = "ONE_LEVEL",

+        symbols[Group1] = [ Caps_Lock ],

+        actions[Group1] = [ SetMods(modifiers=Control) ]    

+    };

+    modifier_map Control { <CAPS> };

+};

diff --git a/xorg-server/xkeyboard-config/symbols/et b/xorg-server/xkeyboard-config/symbols/et
index 6f71b2f97..e1530c2ad 100644
--- a/xorg-server/xkeyboard-config/symbols/et
+++ b/xorg-server/xkeyboard-config/symbols/et
@@ -31,18 +31,18 @@ xkb_symbols "olpc" {
 

     key <AD01>	{ [        0x01001240,  0x01001250 ]	}; // q

     key <AD02>	{ [        0x010012C8,  VoidSymbol ]	}; // w

-    key <AD03>	{ [        e,           E          ]	}; // e

+    key <AD03>	{ [        0x0100FE69,  0x0100FE70 ]	}; // dead e

     key <AD04>	{ [        0x01001228,  VoidSymbol ]	}; // r

     key <AD05>	{ [        0x01001270,  0x01001320 ]	}; // t

     key <AD06>	{ [        0x010012E8,  VoidSymbol ]	}; // y

-    key <AD07>	{ [        u,           U          ]	}; // u

-    key <AD08>	{ [        i,           I          ]	}; // i

-    key <AD09>	{ [        o,           O          ]	}; // o

+    key <AD07>	{ [        0x0100FE75,  0x0100FE76 ]	}; // dead u

+    key <AD08>	{ [        0x0100FE71,  0x0100FE72 ]	}; // dead i

+    key <AD09>	{ [        0x0100FE73,  0x0100FE74 ]	}; // dead o

     key <AD10>	{ [        0x01001350,  0x01001330 ]	}; // p

     key <AD11>	{ [        0x01001340,  0x01001338 ]	}; // [

     key <AD12>	{ [        0x01001328,  0x01001280 ]	}; // ]

 

-    key <AC01>	{ [        a,           A          ]	}; // a

+    key <AC01>	{ [        0x0100FE67,  0x0100FE68 ]	}; // dead a

     key <AC02>	{ [        0x01001230,  0x01001220 ]	}; // s

     key <AC03>	{ [        0x010012F0,  0x010012F8 ]	}; // d

     key <AC04>	{ [        0x01001348,  VoidSymbol ]	}; // f

@@ -57,7 +57,7 @@ xkb_symbols "olpc" {
 

     key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z

     key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x

-    key <AB03>  { [        0x01001278,  VoidSymbol ]    }; // c

+    key <AB03>  { [        0x01001278,  0x0100FE78 ]    }; // c

     key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v

     key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b

     key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n

@@ -65,7 +65,7 @@ xkb_symbols "olpc" {
 

     key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <

     key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >

-    key <AB10>  { [        0x01001367,  VoidSymbol ]    }; // ?

+    key <AB10>  { [        0x01001367,  question   ]    }; // ?

 

     key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl

 

diff --git a/xorg-server/xkeyboard-config/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn
index 44e5e4e67..462a953e8 100644
--- a/xorg-server/xkeyboard-config/symbols/mn
+++ b/xorg-server/xkeyboard-config/symbols/mn
@@ -74,6 +74,8 @@ xkb_symbols "olpc" {
 

   include "mn(basic)"

 

+  key <AE07> { [ 7,                 semicolon,          ampersand       ] };

+

   key <BKSL> { [ backslash,         bar,     		exclam          ] };

 

   include "group(olpc)"

diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index 635fa348a..9cb14c873 100644
--- a/xorg-server/xkeyboard-config/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
@@ -65,56 +65,57 @@ xkb_symbols "basic" {
 };

 

 partial alphanumeric_keys

-xkb_symbols "olpc" {

 

+xkb_symbols "olpc" {

 // Contact: Walter Bender <walter@laptop.org>

 

   include "np"

-      key <TLDE> { [      grave,     asciitilde 	]	};

-      key <AE01> { [      0x1000967	 		]	}; // Nepali digit one

-      key <AE02> { [      0x1000968			]	}; // Nepali digit two

-      key <AE03> { [      0x1000969 	 		]	}; // Nepali digit three

-      key <AE04> { [      0x100096A  	 		]	}; // Nepali digit four

-      key <AE05> { [      0x100096B  	 		]	}; // Nepali digit five

-      key <AE06> { [      0x100096C,  sterling 	 	]	}; // Nepali digit six

-      key <AE07> { [      0x100096D,  eurosign 	 	]	}; // Nepali digit seven

-      key <AE08> { [      0x100096e  	 		]	}; // Nepali digit eight

-      key <AE09> { [      0x100096F	 		]	}; // Nepali digit nine

-      key <AE10> { [      0x1000966			]	}; // Nepali digit zero

-      key <AE12> { [      0x1000950,  0x1000903 	]	}; // OM, SIGN VISARGA

-

-      key <AD01> { [      0x100091C,  0x100091D 	]	}; // JA, JHA

-      key <AD02> { [      0x1000917,  0x1000918       	]	}; // GA, GHA

-      key <AD03> { [      0x100092F,  0x100091E 	]	}; // YA, YNA

-      key <AD04> { [      0x1000938,  0x1000936       	]	}; // SA, SHA

-      key <AD05> { [      0x100090F,  0x1000910		]	}; // E, AI

-      key <AD06> { [      0x100091B,  0x100091A         ]       }; // CHHA, CHA

-      key <AD07> { [      0x100092A,  0x100092B 	]	}; // PA, PHA

-      key <AD08> { [      0x1000947,  0x1000948       	]	}; // VOWEL SIGN E, VOWEL SIGN AI

-      key <AD09> { [      0x100094B,  0x100093E		]	}; // VOWEL SIGN O, VOWEL SIGN AA

-      key <AD10> { [      0x1000924,  0x1000925       	]	}; // TA, THA

-      key <AD11> { [      0x1000909,  0x100090A 	]	}; // HRSHWA U, DIRGHA UU

-      key <AD12> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN HRSHWA I, VOWEL SIGN DIRGHA II

-

-      key <AC01> { [      0x100092E,  0x1000902         ]       }; // MA, SIGN ANUSVARA

-      key <AC02> { [      0x1000907,  0x1000908		]	}; // HRSHWA I, DIRGHA II

-      key <AC03> { [      0x1000928,  0x1000923         ]       }; // NA, NNA

-      key <AC04> { [      0x100094D,  0x1000921		]       }; // VIRAMA (HALANTA?), DDA

-      key <AC05> { [      0x100091F,  0x1000920       	]	}; // TTA, TTHA

-      key <AC06> { [      0x1000926,  0x1000927       	]	}; // DA, DHA

-      key <AC07> { [      0x100093E,  0x1000901       	]	}; // SIGN AA, SIGN CANDRABINDU

-      key <AC08> { [      0x1000930,  0x1000943       	]	}; // RA, VOWEL SIGN VOCALIC R

-      key <AC09> { [      0x1000915,  0x1000916 	]	}; // KA, KHA

-

-      key <AB01> { [      0x1000937,  0x100090B		]	}; // SSA, VOCALIC R (RRI)

-      key <AB02> { [      0x100092C,  0x100092D		]       }; // BA, BHA

-      key <AB03> { [      0x1000941,  0x1000942       	]	}; // VOWEL SIGN HRSHWA U, VOWEL SIGN DIRGHA U (UU)

-      key <AB04> { [      0x1000939,  0x1000922 	]	}; // HA, DDHA

-      key <AB05> { [      0x1000913,  0x1000914		]	}; // O, AU

-      key <AB06> { [      0x1000905,  0x1000906		]	}; // A, AA

-      key <AB07> { [      0x1000932,  0x1000919 	]	}; // LA, NGA

-      key <AB08> { [      comma,  0x1000935		]       }; // VA

-      key <AB09> { [      0x1000964,  0x1000965		]       }; // PURNA VIRAM, DIRGHA VIRAM

+      key <TLDE> { [      0x100091E,  0x1000965 	]	}; // NYA; double danda

+      key <AE01> { [      0x1000967,  0x10FFFFD	]	}; // Nepali digit one; U091C+U094D+U091E

+      key <AE02> { [      0x1000968,  0x1000908		]	}; // Nepali digit two;      key <AE03> { [      0x1000969,  0x1000918 	]	}; // Nepali digit three;

+      key <AE04> { [      0x100096A,  0x10FFFFC  	]	}; // Nepali digit four; U0926+U094D+U0927

+      key <AE05> { [      0x100096B,  0x100091B  	]	}; // Nepali digit five

+      key <AE06> { [      0x100096C,  0x100091F  	]	}; // Nepali digit six

+      key <AE07> { [      0x100096D,  0x1000920  	]	}; // Nepali digit seven

+      key <AE08> { [      0x100096e,  0x1000921  	]	}; // Nepali digit eight

+      key <AE09> { [      0x100096F,  0x1000922	 	]	}; // Nepali digit nine

+      key <AE10> { [      0x1000966,  0x1000923		]	}; // Nepali digit zero

+      key <AE11> { [      0x1000914,  0x1000913         ]       }; // O, AU

+      key <AE12> { [      0x100200C,  0x1000902 	]       }; // ZERO-WIDTH-NON-JOINER (ZWNJ); SIGN ANUSVARA

+      key <BKSL> { [      0x100094D,  0x100200D 	]	}; // SIGN VIRAMA; ZERO-WIDTH-JOINER (ZWJ)

+      key <AD01> { [      0x10FFFFB,  0x10FFFFA 	]	}; // U0924+U094D+U0930; U0924+U094D+U0924

+      key <AD02> { [      0x1000927,  0x10FFFF9   	]	}; // DHA; U0921+U094D+U0922

+      key <AD03> { [      0x100092D,  0x1000910 	]	}; // BHA, AI

+      key <AD04> { [      0x100091A,  0x10FFFF8       ]	}; // CA; U0926+U094D+U0935

+      key <AD05> { [      0x1000924,  0x10FFFF7		]	}; // TA; U091F+U094D+U091F

+      key <AD06> { [      0x1000925,  0x10FFFF6   ]       }; // THA; U0920+U094D+U0920

+      key <AD07> { [      0x1000917,  0x100090A 	]	}; // GA, UU

+      key <AD08> { [      0x1000937,  0x10FFFF5    	]	}; // SSA; U0915+U094D+U0937

+      key <AD09> { [      0x100092F,  0x1000907 	]	}; // YA, I

+      key <AD10> { [      0x1000909,  0x100090F 	]	}; // U, E

+      key <AD11> { [      0x10FFFF4,  0x1000943 	]	}; // U0928+U094D+ZWJ; VOWEL SIGN VOCALIC R

+      key <AD12> { [      0x1000947,  0x1000948 	]	}; // SIGN E; SIGN AI

+      key <AC01> { [      0x100092C,  0x1000906         ]       }; // BA, AA

+      key <AC02> { [      0x1000915,  0x10FFFF3	]	}; // KA; U0919+U094D+U0915

+      key <AC03> { [      0x100092E,  0x10FFFF2      ]       }; // MA; U0919+U094D+U0917

+      key <AC04> { [      0x100093E,  0x1000901		]       }; // CANDRABINDU, VOWEL SIGN AA

+      key <AC05> { [      0x1000928,  0x10FFFF1      	]	}; // NA; U0926+U094D+U0926

+      key <AC06> { [      0x100091C,  0x100091D       	]	}; // JA, JHA

+      key <AC07> { [      0x1000935,  0x100094B       	]	}; // VA, VOWEL SIGN O

+      key <AC08> { [      0x100092A,  0x100092B       	]	}; // PA, PHA

+      key <AC09> { [      0x100093F,  0x1000940 	]	}; // VOWEL SIGN I, VOWEL SIGN II

+      key <AC10> { [      0x1000938,  0x10FFFF0 	]	}; // SA; U091F+U094D+U0920

+      key <AC11> { [      0x1000941,  0x1000942 	]	}; // VOWEL SIGN U, VOWEL SIGN UU

+      key <AB01> { [      0x1000936,  0x10FFFEF	]	}; // SHA; U0915+U094D+U0915

+      key <AB02> { [      0x1000939,  0x10FFFEE	]       }; // HA; U0939+U094D+U092F

+      key <AB03> { [      0x1000905, 0x100090B         	]	}; // A; U0909+U090B

+      key <AB04> { [      0x1000916,  0x1000950 	]	}; // KHA, OM

+      key <AB05> { [      0x1000926,  0x100094C		]	}; // DA, VOWEL SIGN AU

+      key <AB06> { [      0x1000932,  0x10FFFED	]	}; // LA; U0926+U094D+U092F

+      key <AB07> { [      0x1000903,  0x10FFFEC 	]	}; // SIGN VISARGA; U0921+U094D+U0921

+      key <AB08> { [      0x100093D,  0x1000919		]       }; // SIGN AVAGRHA; NGA

+      key <AB09> { [      0x1000964,  0x10FFFEB	]       }; // DANDA; U0936+U094D+U0930

+      key <AB10> { [      0x1000930,  0x10FFFEA   		]       }; // RA; U0930+U0941

 

       include "group(olpc)"

 };