Merge Mesa 19.2.8

9 files changed, 0 insertions, 1865 deletions

diff --git a/lib/mesa/src/util/xmlpool/Makefile.am b/lib/mesa/src/util/xmlpool/Makefile.am
deleted file mode 100644
index 7110b45ef..000000000
--- a/lib/mesa/src/util/xmlpool/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-# Convenient makefile for managing translations.
-
-# Prerequisites:
-# - GNU gettext
-# - Python
-
-# Adding new translations
-# -----------------------
-
-# To start working on a new translation edit the POS=... line
-# below. If you want to add for example a french translation, add
-# fr.po.
-
-# Then run "make po" to generate a fresh .po file from translatable
-# strings in t_options.h. Now you can edit the new .po file (fr.po in
-# the example above) to translate the strings. Please make sure that
-# your editor encodes the file in UTF-8.
-
-# Updating existing translations
-# ------------------------------
-
-# Run "make po" to update .po files with new translatable strings from
-# t_options.h. Now you can edit the .po files you're interested
-# in. Please make sure that your editor encodes the file in UTF-8.
-
-# Updating options.h
-# ------------------
-
-# Finally run "make" to generate options.h from t_options.h with all
-# translations. Now you can rebuild the drivers. Any common options
-# used by the drivers will have option descriptions with the latest
-# translations.
-
-# Publishing translations
-# -----------------------
-
-# To get your translation(s) into Mesa CVS, please send me your
-# <lang>.po file.
-
-# More information:
-# - info gettext
-
-# The set of supported languages. Add languages as needed.
-POS=ca.po de.po es.po nl.po fr.po sv.po
-
-#
-# Don't change anything below, unless you know what you're doing.
-#
-LANGS=$(POS:%.po=%)
-MOS=$(POS:%.po=%.gmo)
-POT=xmlpool.pot
-
-.PHONY: all clean clean-local pot po mo
-
-EXTRA_DIST = \
-	gen_xmlpool.py \
-	options.h \
-	t_options.h \
-	$(POS) \
-	$(MOS) \
-	SConscript \
-	meson.build \
-	LINGUAS \
-	POTFILES
-
-BUILT_SOURCES = options.h
-CLEANFILES = \
-	options.h
-	$(POS) \
-	$(MOS)
-
-clean-local:
-	rm -f $(MOS)
-
-# Default target options.h
-LOCALEDIR := .
-if REGEN_SOURCES
-options.h: t_options.h $(MOS)
-	$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py \
-	--template $(srcdir)/t_options.h \
-	--output options.h \
-	--localedir $(LOCALEDIR) \
-	--languages $(LANGS)
-endif
-
-# Update .mo files from the corresponding .po files.
-.po.gmo:
-	@mo="$@"; \
-	lang=$${mo%%/*}; \
-	echo "Updating ($$lang) $@ from $?."; \
-	msgfmt -o $@ $?
-
-# Use this target to create or update .po files with new messages in
-# driconf.py.
-po: $(POT)
-	@for po in $(POS); do \
-		if [ -f $$po ]; then \
-			echo "Merging new strings from $(POT) into $@."; \
-			mv $$po $$po~; \
-			msgmerge -o $$po $$po~ $(POT); \
-		else \
-			echo "Initializing $$po from $(POT)."; \
-			msginit -i $(POT) -o $$po~ --locale=$*; \
-			sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $$po~ > $$po; \
-		fi \
-	done
-
-pot: $(POT)
-
-# Extract message catalog from driconf.py.
-$(POT): t_options.h
-	xgettext -L C --from-code utf-8 -o $(POT) t_options.h
diff --git a/lib/mesa/src/util/xmlpool/Makefile.in b/lib/mesa/src/util/xmlpool/Makefile.in
deleted file mode 100644
index 35bfd3378..000000000
--- a/lib/mesa/src/util/xmlpool/Makefile.in
+++ /dev/null
@@ -1,725 +0,0 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2012 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@
-
-# Convenient makefile for managing translations.
-
-# Prerequisites:
-# - GNU gettext
-# - Python
-
-# Adding new translations
-# -----------------------
-
-# To start working on a new translation edit the POS=... line
-# below. If you want to add for example a french translation, add
-# fr.po.
-
-# Then run "make po" to generate a fresh .po file from translatable
-# strings in t_options.h. Now you can edit the new .po file (fr.po in
-# the example above) to translate the strings. Please make sure that
-# your editor encodes the file in UTF-8.
-
-# Updating existing translations
-# ------------------------------
-
-# Run "make po" to update .po files with new translatable strings from
-# t_options.h. Now you can edit the .po files you're interested
-# in. Please make sure that your editor encodes the file in UTF-8.
-
-# Updating options.h
-# ------------------
-
-# Finally run "make" to generate options.h from t_options.h with all
-# translations. Now you can rebuild the drivers. Any common options
-# used by the drivers will have option descriptions with the latest
-# translations.
-
-# Publishing translations
-# -----------------------
-
-# To get your translation(s) into Mesa CVS, please send me your
-# <lang>.po file.
-
-# More information:
-# - info gettext
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-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@
-target_triplet = @target@
-subdir = src/util/xmlpool
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/ax_check_gnu_make.m4 \
-	$(top_srcdir)/m4/ax_check_python_mako_module.m4 \
-	$(top_srcdir)/m4/ax_gcc_builtin.m4 \
-	$(top_srcdir)/m4/ax_gcc_func_attribute.m4 \
-	$(top_srcdir)/m4/ax_prog_bison.m4 \
-	$(top_srcdir)/m4/ax_prog_flex.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/VERSION $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDGPU_CFLAGS = @AMDGPU_CFLAGS@
-AMDGPU_LIBS = @AMDGPU_LIBS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-ANDROID_CFLAGS = @ANDROID_CFLAGS@
-ANDROID_LIBS = @ANDROID_LIBS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BACKTRACE_CFLAGS = @BACKTRACE_CFLAGS@
-BACKTRACE_LIBS = @BACKTRACE_LIBS@
-BSYMBOLIC = @BSYMBOLIC@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@
-CLOCK_LIB = @CLOCK_LIB@
-CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXX11_CXXFLAGS = @CXX11_CXXFLAGS@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-D3D_DRIVER_INSTALL_DIR = @D3D_DRIVER_INSTALL_DIR@
-DEFINES = @DEFINES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DLOPEN_LIBS = @DLOPEN_LIBS@
-DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
-DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
-DRIGL_CFLAGS = @DRIGL_CFLAGS@
-DRIGL_LIBS = @DRIGL_LIBS@
-DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
-DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
-DRI_LIB_DEPS = @DRI_LIB_DEPS@
-DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGL_CFLAGS = @EGL_CFLAGS@
-EGL_LIB_DEPS = @EGL_LIB_DEPS@
-EGL_NATIVE_PLATFORM = @EGL_NATIVE_PLATFORM@
-EGREP = @EGREP@
-ETNAVIV_CFLAGS = @ETNAVIV_CFLAGS@
-ETNAVIV_LIBS = @ETNAVIV_LIBS@
-EXEEXT = @EXEEXT@
-EXPAT_CFLAGS = @EXPAT_CFLAGS@
-EXPAT_LIBS = @EXPAT_LIBS@
-FGREP = @FGREP@
-GALLIUM_PIPE_LOADER_DEFINES = @GALLIUM_PIPE_LOADER_DEFINES@
-GBM_PC_LIB_PRIV = @GBM_PC_LIB_PRIV@
-GBM_PC_REQ_PRIV = @GBM_PC_REQ_PRIV@
-GC_SECTIONS = @GC_SECTIONS@
-GLESv1_CM_LIB_DEPS = @GLESv1_CM_LIB_DEPS@
-GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@
-GLESv2_LIB_DEPS = @GLESv2_LIB_DEPS@
-GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
-GLPROTO_CFLAGS = @GLPROTO_CFLAGS@
-GLPROTO_LIBS = @GLPROTO_LIBS@
-GLVND_CFLAGS = @GLVND_CFLAGS@
-GLVND_LIBS = @GLVND_LIBS@
-GLX_TLS = @GLX_TLS@
-GL_LIB = @GL_LIB@
-GL_LIB_DEPS = @GL_LIB_DEPS@
-GL_PC_CFLAGS = @GL_PC_CFLAGS@
-GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
-GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
-GL_PKGCONF_LIB = @GL_PKGCONF_LIB@
-GREP = @GREP@
-I915_CFLAGS = @I915_CFLAGS@
-I915_LIBS = @I915_LIBS@
-INDENT = @INDENT@
-INDENT_FLAGS = @INDENT_FLAGS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LD_BUILD_ID = @LD_BUILD_ID@
-LD_NO_UNDEFINED = @LD_NO_UNDEFINED@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBATOMIC_LIBS = @LIBATOMIC_LIBS@
-LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@
-LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@
-LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
-LIBDRM_LIBS = @LIBDRM_LIBS@
-LIBELF_CFLAGS = @LIBELF_CFLAGS@
-LIBELF_LIBS = @LIBELF_LIBS@
-LIBGLVND_DATADIR = @LIBGLVND_DATADIR@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSENSORS_LIBS = @LIBSENSORS_LIBS@
-LIBTOOL = @LIBTOOL@
-LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@
-LIBUNWIND_LIBS = @LIBUNWIND_LIBS@
-LIB_DIR = @LIB_DIR@
-LIB_EXT = @LIB_EXT@
-LIPO = @LIPO@
-LLVM_CFLAGS = @LLVM_CFLAGS@
-LLVM_CONFIG = @LLVM_CONFIG@
-LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
-LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@
-LLVM_LDFLAGS = @LLVM_LDFLAGS@
-LLVM_LIBS = @LLVM_LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MSVC2013_COMPAT_CFLAGS = @MSVC2013_COMPAT_CFLAGS@
-MSVC2013_COMPAT_CXXFLAGS = @MSVC2013_COMPAT_CXXFLAGS@
-NINE_MAJOR = @NINE_MAJOR@
-NINE_MINOR = @NINE_MINOR@
-NINE_PATCH = @NINE_PATCH@
-NINE_VERSION = @NINE_VERSION@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NOUVEAU_CFLAGS = @NOUVEAU_CFLAGS@
-NOUVEAU_LIBS = @NOUVEAU_LIBS@
-NVVIEUX_CFLAGS = @NVVIEUX_CFLAGS@
-NVVIEUX_LIBS = @NVVIEUX_LIBS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMX_BELLAGIO_CFLAGS = @OMX_BELLAGIO_CFLAGS@
-OMX_BELLAGIO_LIBS = @OMX_BELLAGIO_LIBS@
-OMX_BELLAGIO_LIB_INSTALL_DIR = @OMX_BELLAGIO_LIB_INSTALL_DIR@
-OMX_TIZONIA_CFLAGS = @OMX_TIZONIA_CFLAGS@
-OMX_TIZONIA_LIBS = @OMX_TIZONIA_LIBS@
-OMX_TIZONIA_LIB_INSTALL_DIR = @OMX_TIZONIA_LIB_INSTALL_DIR@
-OPENCL_LIBNAME = @OPENCL_LIBNAME@
-OPENCL_VERSION = @OPENCL_VERSION@
-OSMESA_LIB = @OSMESA_LIB@
-OSMESA_LIB_DEPS = @OSMESA_LIB_DEPS@
-OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
-OSMESA_PC_REQ = @OSMESA_PC_REQ@
-OSMESA_VERSION = @OSMESA_VERSION@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSIX_SHELL = @POSIX_SHELL@
-PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
-PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-PWR8_CFLAGS = @PWR8_CFLAGS@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RADEON_CFLAGS = @RADEON_CFLAGS@
-RADEON_LIBS = @RADEON_LIBS@
-RANLIB = @RANLIB@
-RM = @RM@
-SCANNER_ARG = @SCANNER_ARG@
-SED = @SED@
-SELINUX_CFLAGS = @SELINUX_CFLAGS@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIMPENROSE_CFLAGS = @SIMPENROSE_CFLAGS@
-SIMPENROSE_LIBS = @SIMPENROSE_LIBS@
-SSE41_CFLAGS = @SSE41_CFLAGS@
-STRIP = @STRIP@
-SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@
-SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@
-SWR_KNL_CXXFLAGS = @SWR_KNL_CXXFLAGS@
-SWR_SKX_CXXFLAGS = @SWR_SKX_CXXFLAGS@
-V3D_SIMULATOR_CFLAGS = @V3D_SIMULATOR_CFLAGS@
-V3D_SIMULATOR_LIBS = @V3D_SIMULATOR_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VA_CFLAGS = @VA_CFLAGS@
-VA_LIBS = @VA_LIBS@
-VA_LIB_INSTALL_DIR = @VA_LIB_INSTALL_DIR@
-VA_MAJOR = @VA_MAJOR@
-VA_MINOR = @VA_MINOR@
-VC4_CFLAGS = @VC4_CFLAGS@
-VC4_LIBS = @VC4_LIBS@
-VDPAU_CFLAGS = @VDPAU_CFLAGS@
-VDPAU_LIBS = @VDPAU_LIBS@
-VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@
-VDPAU_MAJOR = @VDPAU_MAJOR@
-VDPAU_MINOR = @VDPAU_MINOR@
-VERSION = @VERSION@
-VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
-VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
-VL_CFLAGS = @VL_CFLAGS@
-VL_LIBS = @VL_LIBS@
-VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@
-WAYLAND_CLIENT_CFLAGS = @WAYLAND_CLIENT_CFLAGS@
-WAYLAND_CLIENT_LIBS = @WAYLAND_CLIENT_LIBS@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-WAYLAND_PROTOCOLS_CFLAGS = @WAYLAND_PROTOCOLS_CFLAGS@
-WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
-WAYLAND_PROTOCOLS_LIBS = @WAYLAND_PROTOCOLS_LIBS@
-WAYLAND_SCANNER = @WAYLAND_SCANNER@
-WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
-WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
-WAYLAND_SERVER_CFLAGS = @WAYLAND_SERVER_CFLAGS@
-WAYLAND_SERVER_LIBS = @WAYLAND_SERVER_LIBS@
-WNO_OVERRIDE_INIT = @WNO_OVERRIDE_INIT@
-X11_INCLUDES = @X11_INCLUDES@
-XA_MAJOR = @XA_MAJOR@
-XA_MINOR = @XA_MINOR@
-XA_PATCH = @XA_PATCH@
-XA_VERSION = @XA_VERSION@
-XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
-XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
-XCB_DRI3_CFLAGS = @XCB_DRI3_CFLAGS@
-XCB_DRI3_LIBS = @XCB_DRI3_LIBS@
-XCB_DRI3_MODIFIERS_CFLAGS = @XCB_DRI3_MODIFIERS_CFLAGS@
-XCB_DRI3_MODIFIERS_LIBS = @XCB_DRI3_MODIFIERS_LIBS@
-XCB_RANDR_CFLAGS = @XCB_RANDR_CFLAGS@
-XCB_RANDR_LIBS = @XCB_RANDR_LIBS@
-XLIBGL_CFLAGS = @XLIBGL_CFLAGS@
-XLIBGL_LIBS = @XLIBGL_LIBS@
-XLIB_RANDR_CFLAGS = @XLIB_RANDR_CFLAGS@
-XLIB_RANDR_LIBS = @XLIB_RANDR_LIBS@
-XVMC_CFLAGS = @XVMC_CFLAGS@
-XVMC_LIBS = @XVMC_LIBS@
-XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@
-XVMC_MAJOR = @XVMC_MAJOR@
-XVMC_MINOR = @XVMC_MINOR@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acv_mako_found = @acv_mako_found@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-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@
-ifGNUmake = @ifGNUmake@
-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@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-
-# The set of supported languages. Add languages as needed.
-POS = ca.po de.po es.po nl.po fr.po sv.po
-
-#
-# Don't change anything below, unless you know what you're doing.
-#
-LANGS = $(POS:%.po=%)
-MOS = $(POS:%.po=%.gmo)
-POT = xmlpool.pot
-EXTRA_DIST = \
-	gen_xmlpool.py \
-	options.h \
-	t_options.h \
-	$(POS) \
-	$(MOS) \
-	SConscript \
-	meson.build \
-	LINGUAS \
-	POTFILES
-
-BUILT_SOURCES = options.h
-CLEANFILES = \
-	options.h
-
-
-# Default target options.h
-LOCALEDIR := .
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .gmo .po
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/util/xmlpool/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/util/xmlpool/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@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
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile
-installdirs:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-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 "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: all check install install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am 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-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am
-
-
-.PHONY: all clean clean-local pot po mo
-	$(POS) \
-	$(MOS)
-
-clean-local:
-	rm -f $(MOS)
-@REGEN_SOURCES_TRUE@options.h: t_options.h $(MOS)
-@REGEN_SOURCES_TRUE@	$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py \
-@REGEN_SOURCES_TRUE@	--template $(srcdir)/t_options.h \
-@REGEN_SOURCES_TRUE@	--output options.h \
-@REGEN_SOURCES_TRUE@	--localedir $(LOCALEDIR) \
-@REGEN_SOURCES_TRUE@	--languages $(LANGS)
-
-# Update .mo files from the corresponding .po files.
-.po.gmo:
-	@mo="$@"; \
-	lang=$${mo%%/*}; \
-	echo "Updating ($$lang) $@ from $?."; \
-	msgfmt -o $@ $?
-
-# Use this target to create or update .po files with new messages in
-# driconf.py.
-po: $(POT)
-	@for po in $(POS); do \
-		if [ -f $$po ]; then \
-			echo "Merging new strings from $(POT) into $@."; \
-			mv $$po $$po~; \
-			msgmerge -o $$po $$po~ $(POT); \
-		else \
-			echo "Initializing $$po from $(POT)."; \
-			msginit -i $(POT) -o $$po~ --locale=$*; \
-			sed -e 's/charset=.*\\n/charset=UTF-8\\n/' $$po~ > $$po; \
-		fi \
-	done
-
-pot: $(POT)
-
-# Extract message catalog from driconf.py.
-$(POT): t_options.h
-	xgettext -L C --from-code utf-8 -o $(POT) t_options.h
-
-# 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/lib/mesa/src/util/xmlpool/ca.gmo b/lib/mesa/src/util/xmlpool/ca.gmo
deleted file mode 100644
index 2786d3f4d..000000000
--- a/lib/mesa/src/util/xmlpool/ca.gmo
+++ /dev/null
diff --git a/lib/mesa/src/util/xmlpool/de.gmo b/lib/mesa/src/util/xmlpool/de.gmo
deleted file mode 100644
index 313e4b779..000000000
--- a/lib/mesa/src/util/xmlpool/de.gmo
+++ /dev/null
diff --git a/lib/mesa/src/util/xmlpool/es.gmo b/lib/mesa/src/util/xmlpool/es.gmo
deleted file mode 100644
index f4732492f..000000000
--- a/lib/mesa/src/util/xmlpool/es.gmo
+++ /dev/null
diff --git a/lib/mesa/src/util/xmlpool/fr.gmo b/lib/mesa/src/util/xmlpool/fr.gmo
deleted file mode 100644
index 380d43cd9..000000000
--- a/lib/mesa/src/util/xmlpool/fr.gmo
+++ /dev/null
diff --git a/lib/mesa/src/util/xmlpool/nl.gmo b/lib/mesa/src/util/xmlpool/nl.gmo
deleted file mode 100644
index a67fb5a8a..000000000
--- a/lib/mesa/src/util/xmlpool/nl.gmo
+++ /dev/null
diff --git a/lib/mesa/src/util/xmlpool/options.h b/lib/mesa/src/util/xmlpool/options.h
deleted file mode 100644
index ebf969d46..000000000
--- a/lib/mesa/src/util/xmlpool/options.h
+++ /dev/null
@@ -1,1028 +0,0 @@
-/***********************************************************************
- ***        THIS FILE IS GENERATED AUTOMATICALLY. DON'T EDIT!        ***
- ***********************************************************************/
-/*
- * XML DRI client-side driver configuration
- * Copyright (C) 2003 Felix Kuehling
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * FELIX KUEHLING, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- */
-/**
- * \file t_options.h
- * \brief Templates of common options
- * \author Felix Kuehling
- *
- * This file defines macros for common options that can be used to
- * construct driConfigOptions in the drivers. This file is only a
- * template containing English descriptions for options wrapped in
- * gettext(). xgettext can be used to extract translatable
- * strings. These strings can then be translated by anyone familiar
- * with GNU gettext. gen_xmlpool.py takes this template and fills in
- * all the translations. The result (options.h) is included by
- * xmlpool.h which in turn can be included by drivers.
- *
- * The macros used to describe otions in this file are defined in
- * ../xmlpool.h.
- */
-
-/* This is needed for xgettext to extract translatable strings.
- * gen_xmlpool.py will discard this line. */
-/* #include <libintl.h>
- * commented out by gen_xmlpool.py */
-
-/*
- * predefined option sections and options with multi-lingual descriptions
- */
-
-
-/**
- * \brief Debugging options
- */
-#define DRI_CONF_SECTION_DEBUG \
-DRI_CONF_SECTION_BEGIN \
-	DRI_CONF_DESC(en,"Debugging") \
-	DRI_CONF_DESC(ca,"Depuració") \
-	DRI_CONF_DESC(de,"Fehlersuche") \
-	DRI_CONF_DESC(es,"Depuración") \
-	DRI_CONF_DESC(nl,"Debuggen") \
-	DRI_CONF_DESC(fr,"Debogage") \
-	DRI_CONF_DESC(sv,"Felsökning")
-
-#define DRI_CONF_NO_RAST(def) \
-DRI_CONF_OPT_BEGIN_B(no_rast, def) \
-        DRI_CONF_DESC(en,"Disable 3D acceleration") \
-        DRI_CONF_DESC(ca,"Deshabilita l'acceleració 3D") \
-        DRI_CONF_DESC(de,"3D-Beschleunigung abschalten") \
-        DRI_CONF_DESC(es,"Deshabilitar aceleración 3D") \
-        DRI_CONF_DESC(nl,"3D versnelling uitschakelen") \
-        DRI_CONF_DESC(fr,"Désactiver l'accélération 3D") \
-        DRI_CONF_DESC(sv,"Inaktivera 3D-accelerering") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PERFORMANCE_BOXES(def) \
-DRI_CONF_OPT_BEGIN_B(performance_boxes, def) \
-        DRI_CONF_DESC(en,"Show performance boxes") \
-        DRI_CONF_DESC(ca,"Mostra les caixes de rendiment") \
-        DRI_CONF_DESC(de,"Zeige Performanceboxen") \
-        DRI_CONF_DESC(es,"Mostrar cajas de rendimiento") \
-        DRI_CONF_DESC(nl,"Laat prestatie boxjes zien") \
-        DRI_CONF_DESC(fr,"Afficher les boîtes de performance") \
-        DRI_CONF_DESC(sv,"Visa prestandarutor") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALWAYS_FLUSH_BATCH(def) \
-DRI_CONF_OPT_BEGIN_B(always_flush_batch, def) \
-        DRI_CONF_DESC(en,"Enable flushing batchbuffer after each draw call") \
-        DRI_CONF_DESC(ca,"Habilita el buidatge del batchbuffer després de cada trucada de dibuix") \
-        DRI_CONF_DESC(de,"Aktiviere sofortige Leerung des Stapelpuffers nach jedem Zeichenaufruf") \
-        DRI_CONF_DESC(es,"Habilitar vaciado del batchbuffer después de cada llamada de dibujo") \
-        DRI_CONF_DESC(nl,"Enable flushing batchbuffer after each draw call") \
-        DRI_CONF_DESC(fr,"Enable flushing batchbuffer after each draw call") \
-        DRI_CONF_DESC(sv,"Enable flushing batchbuffer after each draw call") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALWAYS_FLUSH_CACHE(def) \
-DRI_CONF_OPT_BEGIN_B(always_flush_cache, def) \
-        DRI_CONF_DESC(en,"Enable flushing GPU caches with each draw call") \
-        DRI_CONF_DESC(ca,"Habilita el buidatge de les memòries cau de GPU amb cada trucada de dibuix") \
-        DRI_CONF_DESC(de,"Aktiviere sofortige Leerung der GPU-Zwischenspeicher mit jedem Zeichenaufruf") \
-        DRI_CONF_DESC(es,"Habilitar vaciado de los cachés GPU con cada llamada de dibujo") \
-        DRI_CONF_DESC(nl,"Enable flushing GPU caches with each draw call") \
-        DRI_CONF_DESC(fr,"Enable flushing GPU caches with each draw call") \
-        DRI_CONF_DESC(sv,"Enable flushing GPU caches with each draw call") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_THROTTLING(def) \
-DRI_CONF_OPT_BEGIN_B(disable_throttling, def) \
-	DRI_CONF_DESC(en,"Disable throttling on first batch after flush") \
-	DRI_CONF_DESC(ca,"Deshabilita la regulació en el primer lot després de buidar") \
-	DRI_CONF_DESC(de,"Disable throttling on first batch after flush") \
-	DRI_CONF_DESC(es,"Deshabilitar regulación del primer lote después de vaciar") \
-	DRI_CONF_DESC(nl,"Disable throttling on first batch after flush") \
-	DRI_CONF_DESC(fr,"Disable throttling on first batch after flush") \
-	DRI_CONF_DESC(sv,"Disable throttling on first batch after flush") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(def) \
-DRI_CONF_OPT_BEGIN_B(force_glsl_extensions_warn, def) \
-        DRI_CONF_DESC(en,"Force GLSL extension default behavior to 'warn'") \
-        DRI_CONF_DESC(ca,"Força que el comportament per defecte de les extensions GLSL sigui 'warn'") \
-        DRI_CONF_DESC(de,"Force GLSL extension default behavior to 'warn'") \
-        DRI_CONF_DESC(es,"Forzar que el comportamiento por defecto de las extensiones GLSL sea 'warn'") \
-        DRI_CONF_DESC(nl,"Force GLSL extension default behavior to 'warn'") \
-        DRI_CONF_DESC(fr,"Force GLSL extension default behavior to 'warn'") \
-        DRI_CONF_DESC(sv,"Force GLSL extension default behavior to 'warn'") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED(def) \
-DRI_CONF_OPT_BEGIN_B(disable_blend_func_extended, def) \
-        DRI_CONF_DESC(en,"Disable dual source blending") \
-        DRI_CONF_DESC(ca,"Deshabilita la barreja de font dual") \
-        DRI_CONF_DESC(de,"Disable dual source blending") \
-        DRI_CONF_DESC(es,"Deshabilitar mezcla de fuente dual") \
-        DRI_CONF_DESC(nl,"Disable dual source blending") \
-        DRI_CONF_DESC(fr,"Disable dual source blending") \
-        DRI_CONF_DESC(sv,"Disable dual source blending") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION(def) \
-DRI_CONF_OPT_BEGIN_B(dual_color_blend_by_location, def) \
-        DRI_CONF_DESC(en,"Identify dual color blending sources by location rather than index") \
-        DRI_CONF_DESC(ca,"Identify dual color blending sources by location rather than index") \
-        DRI_CONF_DESC(de,"Identify dual color blending sources by location rather than index") \
-        DRI_CONF_DESC(es,"Identify dual color blending sources by location rather than index") \
-        DRI_CONF_DESC(nl,"Identify dual color blending sources by location rather than index") \
-        DRI_CONF_DESC(fr,"Identify dual color blending sources by location rather than index") \
-        DRI_CONF_DESC(sv,"Identify dual color blending sources by location rather than index") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS(def) \
-DRI_CONF_OPT_BEGIN_B(disable_glsl_line_continuations, def) \
-        DRI_CONF_DESC(en,"Disable backslash-based line continuations in GLSL source") \
-        DRI_CONF_DESC(ca,"Deshabilita les continuacions de línia basades en barra invertida en la font GLSL") \
-        DRI_CONF_DESC(de,"Disable backslash-based line continuations in GLSL source") \
-        DRI_CONF_DESC(es,"Deshabilitar continuaciones de línea basadas en barra inversa en el código GLSL") \
-        DRI_CONF_DESC(nl,"Disable backslash-based line continuations in GLSL source") \
-        DRI_CONF_DESC(fr,"Disable backslash-based line continuations in GLSL source") \
-        DRI_CONF_DESC(sv,"Disable backslash-based line continuations in GLSL source") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_SHADER_BIT_ENCODING(def) \
-DRI_CONF_OPT_BEGIN_B(disable_shader_bit_encoding, def) \
-        DRI_CONF_DESC(en,"Disable GL_ARB_shader_bit_encoding") \
-        DRI_CONF_DESC(ca,"Deshabilita el GL_ARB_shader_bit_encoding") \
-        DRI_CONF_DESC(de,"Disable GL_ARB_shader_bit_encoding") \
-        DRI_CONF_DESC(es,"Deshabilitar GL_ARB_shader_bit_encoding") \
-        DRI_CONF_DESC(nl,"Disable GL_ARB_shader_bit_encoding") \
-        DRI_CONF_DESC(fr,"Disable GL_ARB_shader_bit_encoding") \
-        DRI_CONF_DESC(sv,"Disable GL_ARB_shader_bit_encoding") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FORCE_GLSL_VERSION(def) \
-DRI_CONF_OPT_BEGIN_V(force_glsl_version, int, def, "0:999") \
-        DRI_CONF_DESC(en,"Force a default GLSL version for shaders that lack an explicit #version line") \
-        DRI_CONF_DESC(ca,"Força una versió GLSL per defecte en els shaders als quals lis manca una línia #version explícita") \
-        DRI_CONF_DESC(de,"Force a default GLSL version for shaders that lack an explicit #version line") \
-        DRI_CONF_DESC(es,"Forzar una versión de GLSL por defecto en los shaders a los cuales les falta una línea #version explícita") \
-        DRI_CONF_DESC(nl,"Force a default GLSL version for shaders that lack an explicit #version line") \
-        DRI_CONF_DESC(fr,"Force a default GLSL version for shaders that lack an explicit #version line") \
-        DRI_CONF_DESC(sv,"Force a default GLSL version for shaders that lack an explicit #version line") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER(def) \
-DRI_CONF_OPT_BEGIN_B(allow_glsl_extension_directive_midshader, def) \
-        DRI_CONF_DESC(en,"Allow GLSL #extension directives in the middle of shaders") \
-        DRI_CONF_DESC(ca,"Permet les directives #extension GLSL en el mitjà dels shaders") \
-        DRI_CONF_DESC(de,"Allow GLSL #extension directives in the middle of shaders") \
-        DRI_CONF_DESC(es,"Permite directivas #extension GLSL en medio de los shaders") \
-        DRI_CONF_DESC(nl,"Allow GLSL #extension directives in the middle of shaders") \
-        DRI_CONF_DESC(fr,"Allow GLSL #extension directives in the middle of shaders") \
-        DRI_CONF_DESC(sv,"Allow GLSL #extension directives in the middle of shaders") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_GLSL_BUILTIN_VARIABLE_REDECLARATION(def) \
-DRI_CONF_OPT_BEGIN_B(allow_glsl_builtin_variable_redeclaration, def) \
-        DRI_CONF_DESC(en,"Allow GLSL built-in variables to be redeclared verbatim") \
-        DRI_CONF_DESC(ca,"Allow GLSL built-in variables to be redeclared verbatim") \
-        DRI_CONF_DESC(de,"Allow GLSL built-in variables to be redeclared verbatim") \
-        DRI_CONF_DESC(es,"Allow GLSL built-in variables to be redeclared verbatim") \
-        DRI_CONF_DESC(nl,"Allow GLSL built-in variables to be redeclared verbatim") \
-        DRI_CONF_DESC(fr,"Allow GLSL built-in variables to be redeclared verbatim") \
-        DRI_CONF_DESC(sv,"Allow GLSL built-in variables to be redeclared verbatim") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION(def) \
-DRI_CONF_OPT_BEGIN_B(allow_higher_compat_version, def) \
-        DRI_CONF_DESC(en,"Allow a higher compat profile (version 3.1+) for apps that request it") \
-        DRI_CONF_DESC(ca,"Allow a higher compat profile (version 3.1+) for apps that request it") \
-        DRI_CONF_DESC(de,"Allow a higher compat profile (version 3.1+) for apps that request it") \
-        DRI_CONF_DESC(es,"Allow a higher compat profile (version 3.1+) for apps that request it") \
-        DRI_CONF_DESC(nl,"Allow a higher compat profile (version 3.1+) for apps that request it") \
-        DRI_CONF_DESC(fr,"Allow a higher compat profile (version 3.1+) for apps that request it") \
-        DRI_CONF_DESC(sv,"Allow a higher compat profile (version 3.1+) for apps that request it") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FORCE_GLSL_ABS_SQRT(def) \
-DRI_CONF_OPT_BEGIN_B(force_glsl_abs_sqrt, def) \
-        DRI_CONF_DESC(en,"Force computing the absolute value for sqrt() and inversesqrt()") \
-        DRI_CONF_DESC(ca,"Force computing the absolute value for sqrt() and inversesqrt()") \
-        DRI_CONF_DESC(de,"Force computing the absolute value for sqrt() and inversesqrt()") \
-        DRI_CONF_DESC(es,"Force computing the absolute value for sqrt() and inversesqrt()") \
-        DRI_CONF_DESC(nl,"Force computing the absolute value for sqrt() and inversesqrt()") \
-        DRI_CONF_DESC(fr,"Force computing the absolute value for sqrt() and inversesqrt()") \
-        DRI_CONF_DESC(sv,"Force computing the absolute value for sqrt() and inversesqrt()") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD(def) \
-DRI_CONF_OPT_BEGIN_B(glsl_correct_derivatives_after_discard, def) \
-        DRI_CONF_DESC(en,"Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \
-        DRI_CONF_DESC(ca,"Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \
-        DRI_CONF_DESC(de,"Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \
-        DRI_CONF_DESC(es,"Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \
-        DRI_CONF_DESC(nl,"Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \
-        DRI_CONF_DESC(fr,"Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \
-        DRI_CONF_DESC(sv,"Implicit and explicit derivatives after a discard behave as if the discard didn't happen") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_GLSL_CROSS_STAGE_INTERPOLATION_MISMATCH(def) \
-DRI_CONF_OPT_BEGIN_B(allow_glsl_cross_stage_interpolation_mismatch, def) \
-        DRI_CONF_DESC(en,"Allow interpolation qualifier mismatch across shader stages") \
-        DRI_CONF_DESC(ca,"Allow interpolation qualifier mismatch across shader stages") \
-        DRI_CONF_DESC(de,"Allow interpolation qualifier mismatch across shader stages") \
-        DRI_CONF_DESC(es,"Allow interpolation qualifier mismatch across shader stages") \
-        DRI_CONF_DESC(nl,"Allow interpolation qualifier mismatch across shader stages") \
-        DRI_CONF_DESC(fr,"Allow interpolation qualifier mismatch across shader stages") \
-        DRI_CONF_DESC(sv,"Allow interpolation qualifier mismatch across shader stages") \
-DRI_CONF_OPT_END
-
-/**
- * \brief Image quality-related options
- */
-#define DRI_CONF_SECTION_QUALITY \
-DRI_CONF_SECTION_BEGIN \
-	DRI_CONF_DESC(en,"Image Quality") \
-	DRI_CONF_DESC(ca,"Qualitat d'imatge") \
-	DRI_CONF_DESC(de,"Bildqualität") \
-	DRI_CONF_DESC(es,"Calidad de imagen") \
-	DRI_CONF_DESC(nl,"Beeldkwaliteit") \
-	DRI_CONF_DESC(fr,"Qualité d'image") \
-	DRI_CONF_DESC(sv,"Bildkvalitet")
-
-#define DRI_CONF_EXCESS_MIPMAP(def) \
-DRI_CONF_OPT_BEGIN_B(excess_mipmap, def) \
-	DRI_CONF_DESC(en,"Enable extra mipmap level") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_TEXTURE_DEPTH_FB       0
-#define DRI_CONF_TEXTURE_DEPTH_32       1
-#define DRI_CONF_TEXTURE_DEPTH_16       2
-#define DRI_CONF_TEXTURE_DEPTH_FORCE_16 3
-#define DRI_CONF_TEXTURE_DEPTH(def) \
-DRI_CONF_OPT_BEGIN_V(texture_depth,enum,def,"0:3") \
-	DRI_CONF_DESC_BEGIN(en,"Texture color depth") \
-                DRI_CONF_ENUM(0,"Prefer frame buffer color depth") \
-                DRI_CONF_ENUM(1,"Prefer 32 bits per texel") \
-                DRI_CONF_ENUM(2,"Prefer 16 bits per texel") \
-                DRI_CONF_ENUM(3,"Force 16 bits per texel") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(ca,"Profunditat de color de textura") \
-                DRI_CONF_ENUM(0,"Prefereix profunditat de color del framebuffer") \
-                DRI_CONF_ENUM(1,"Prefereix 32 bits per texel") \
-                DRI_CONF_ENUM(2,"Prefereix 16 bits per texel") \
-                DRI_CONF_ENUM(3,"Força 16 bits per texel") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(de,"Texturfarbtiefe") \
-                DRI_CONF_ENUM(0,"Bevorzuge Farbtiefe des Framebuffers") \
-                DRI_CONF_ENUM(1,"Bevorzuge 32 bits pro Texel") \
-                DRI_CONF_ENUM(2,"Bevorzuge 16 bits pro Texel") \
-                DRI_CONF_ENUM(3,"Erzwinge 16 bits pro Texel") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(es,"Profundidad de color de textura") \
-                DRI_CONF_ENUM(0,"Preferir profundidad de color del framebuffer") \
-                DRI_CONF_ENUM(1,"Preferir 32 bits por texel") \
-                DRI_CONF_ENUM(2,"Preferir 16 bits por texel") \
-                DRI_CONF_ENUM(3,"Forzar a 16 bits por texel") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(nl,"Textuurkleurendiepte") \
-                DRI_CONF_ENUM(0,"Prefereer kaderbufferkleurdiepte") \
-                DRI_CONF_ENUM(1,"Prefereer 32 bits per texel") \
-                DRI_CONF_ENUM(2,"Prefereer 16 bits per texel") \
-                DRI_CONF_ENUM(3,"Dwing 16 bits per texel af") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(fr,"Profondeur de texture") \
-                DRI_CONF_ENUM(0,"Profondeur de couleur") \
-                DRI_CONF_ENUM(1,"Préférer 32 bits par texel") \
-                DRI_CONF_ENUM(2,"Prérérer 16 bits par texel") \
-                DRI_CONF_ENUM(3,"Forcer 16 bits par texel") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(sv,"Färgdjup för texturer") \
-                DRI_CONF_ENUM(0,"Föredra färgdjupet för framebuffer") \
-                DRI_CONF_ENUM(1,"Föredra 32 bitar per texel") \
-                DRI_CONF_ENUM(2,"Föredra 16 bitar per texel") \
-                DRI_CONF_ENUM(3,"Tvinga 16 bitar per texel") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DEF_MAX_ANISOTROPY(def,range) \
-DRI_CONF_OPT_BEGIN_V(def_max_anisotropy,float,def,range) \
-        DRI_CONF_DESC(en,"Initial maximum value for anisotropic texture filtering") \
-        DRI_CONF_DESC(ca,"Valor màxim inicial per a la filtració de textura anisòtropa") \
-        DRI_CONF_DESC(de,"Initialer Maximalwert für anisotropische Texturfilterung") \
-        DRI_CONF_DESC(es,"Valor máximo inicial para filtrado anisotrópico de textura") \
-        DRI_CONF_DESC(nl,"Initïele maximum waarde voor anisotrophische textuur filtering") \
-        DRI_CONF_DESC(fr,"Valeur maximale initiale pour le filtrage anisotropique de texture") \
-        DRI_CONF_DESC(sv,"Initialt maximalt värde för anisotropisk texturfiltrering") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_NO_NEG_LOD_BIAS(def) \
-DRI_CONF_OPT_BEGIN_B(no_neg_lod_bias, def) \
-        DRI_CONF_DESC(en,"Forbid negative texture LOD bias") \
-        DRI_CONF_DESC(ca,"Prohibeix una parcialitat negativa del Nivell de Detalle (LOD) de les textures") \
-        DRI_CONF_DESC(de,"Verbiete negative Textur-Detailgradverschiebung") \
-        DRI_CONF_DESC(es,"Prohibir valores negativos de Nivel De Detalle (LOD) de texturas") \
-        DRI_CONF_DESC(nl,"Verbied negatief niveau detailonderscheid (LOD) van texturen") \
-        DRI_CONF_DESC(fr,"Interdire le LOD bias negatif") \
-        DRI_CONF_DESC(sv,"Förbjud negativ LOD-kompensation för texturer") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PRECISE_TRIG(def) \
-DRI_CONF_OPT_BEGIN_B(precise_trig, def) \
-        DRI_CONF_DESC(en,"Prefer accuracy over performance in trig functions") \
-        DRI_CONF_DESC(ca,"Prefer accuracy over performance in trig functions") \
-        DRI_CONF_DESC(de,"Prefer accuracy over performance in trig functions") \
-        DRI_CONF_DESC(es,"Prefer accuracy over performance in trig functions") \
-        DRI_CONF_DESC(nl,"Prefer accuracy over performance in trig functions") \
-        DRI_CONF_DESC(fr,"Prefer accuracy over performance in trig functions") \
-        DRI_CONF_DESC(sv,"Prefer accuracy over performance in trig functions") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_COLOR_REDUCTION_ROUND 0
-#define DRI_CONF_COLOR_REDUCTION_DITHER 1
-#define DRI_CONF_COLOR_REDUCTION(def) \
-DRI_CONF_OPT_BEGIN_V(color_reduction,enum,def,"0:1") \
-        DRI_CONF_DESC_BEGIN(en,"Initial color reduction method") \
-                DRI_CONF_ENUM(0,"Round colors") \
-                DRI_CONF_ENUM(1,"Dither colors") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(ca,"Mètode inicial de reducció de color") \
-                DRI_CONF_ENUM(0,"Colors arrodonits") \
-                DRI_CONF_ENUM(1,"Colors tramats") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(de,"Initiale Farbreduktionsmethode") \
-                DRI_CONF_ENUM(0,"Farben runden") \
-                DRI_CONF_ENUM(1,"Farben rastern") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(es,"Método inicial de reducción de color") \
-                DRI_CONF_ENUM(0,"Colores redondeados") \
-                DRI_CONF_ENUM(1,"Colores suavizados") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(nl,"Initïele kleurreductie methode") \
-                DRI_CONF_ENUM(0,"Rond kleuren af") \
-                DRI_CONF_ENUM(1,"Rasteriseer kleuren") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(fr,"Technique de réduction de couleurs") \
-                DRI_CONF_ENUM(0,"Arrondir les valeurs de couleur") \
-                DRI_CONF_ENUM(1,"Tramer les couleurs") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(sv,"Initial färgminskningsmetod") \
-                DRI_CONF_ENUM(0,"Avrunda färger") \
-                DRI_CONF_ENUM(1,"Utjämna färger") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ROUND_TRUNC 0
-#define DRI_CONF_ROUND_ROUND 1
-#define DRI_CONF_ROUND_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(round_mode,enum,def,"0:1") \
-	DRI_CONF_DESC_BEGIN(en,"Color rounding method") \
-                DRI_CONF_ENUM(0,"Round color components downward") \
-                DRI_CONF_ENUM(1,"Round to nearest color") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(ca,"Mètode d'arrodoniment de color") \
-                DRI_CONF_ENUM(0,"Arrodoneix els components de color a baix") \
-                DRI_CONF_ENUM(1,"Arrodoneix al color més proper") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(de,"Farbrundungsmethode") \
-                DRI_CONF_ENUM(0,"Farbkomponenten abrunden") \
-                DRI_CONF_ENUM(1,"Zur ähnlichsten Farbe runden") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(es,"Método de redondeo de colores") \
-                DRI_CONF_ENUM(0,"Redondear hacia abajo los componentes de color") \
-                DRI_CONF_ENUM(1,"Redondear al color más cercano") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(nl,"Kleurafrondingmethode") \
-                DRI_CONF_ENUM(0,"Rond kleurencomponenten af naar beneden") \
-                DRI_CONF_ENUM(1,"Rond af naar dichtsbijzijnde kleur") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(fr,"Méthode d'arrondi des couleurs") \
-                DRI_CONF_ENUM(0,"Arrondi à l'inférieur") \
-                DRI_CONF_ENUM(1,"Arrondi au plus proche") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(sv,"Färgavrundningsmetod") \
-                DRI_CONF_ENUM(0,"Avrunda färdkomponenter nedåt") \
-                DRI_CONF_ENUM(1,"Avrunda till närmsta färg") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DITHER_XERRORDIFF 0
-#define DRI_CONF_DITHER_XERRORDIFFRESET 1
-#define DRI_CONF_DITHER_ORDERED 2
-#define DRI_CONF_DITHER_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(dither_mode,enum,def,"0:2") \
-	DRI_CONF_DESC_BEGIN(en,"Color dithering method") \
-                DRI_CONF_ENUM(0,"Horizontal error diffusion") \
-                DRI_CONF_ENUM(1,"Horizontal error diffusion, reset error at line start") \
-                DRI_CONF_ENUM(2,"Ordered 2D color dithering") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(ca,"Mètode de tramat de color") \
-                DRI_CONF_ENUM(0,"Difusió d'error horitzontal") \
-                DRI_CONF_ENUM(1,"Difusió d'error horitzontal, reinicia l'error a l'inici de la línia") \
-                DRI_CONF_ENUM(2,"Tramat de color 2D ordenat") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(de,"Farbrasterungsmethode") \
-                DRI_CONF_ENUM(0,"Horizontale Fehlerstreuung") \
-                DRI_CONF_ENUM(1,"Horizontale Fehlerstreuung, Fehler am Zeilenanfang zurücksetzen") \
-                DRI_CONF_ENUM(2,"Geordnete 2D Farbrasterung") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(es,"Método de suavizado de color") \
-                DRI_CONF_ENUM(0,"Difusión de error horizontal") \
-                DRI_CONF_ENUM(1,"Difusión de error horizontal, reiniciar error al comienzo de línea") \
-                DRI_CONF_ENUM(2,"Suavizado de color 2D ordenado") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(nl,"Kleurrasteriseringsmethode") \
-                DRI_CONF_ENUM(0,"Horizontale foutdiffusie") \
-                DRI_CONF_ENUM(1,"Horizontale foutdiffusie, zet fout bij lijnbegin terug") \
-                DRI_CONF_ENUM(2,"Geordende 2D kleurrasterisering") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(fr,"Méthode de tramage") \
-                DRI_CONF_ENUM(0,"Diffusion d'erreur horizontale") \
-                DRI_CONF_ENUM(1,"Diffusion d'erreur horizontale, réinitialisé pour chaque ligne") \
-                DRI_CONF_ENUM(2,"Tramage ordonné des couleurs") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(sv,"Färgutjämningsmetod") \
-                DRI_CONF_ENUM(0,"Horisontell felspridning") \
-                DRI_CONF_ENUM(1,"Horisontell felspridning, återställ fel vid radbörjan") \
-                DRI_CONF_ENUM(2,"Ordnad 2D-färgutjämning") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FLOAT_DEPTH(def) \
-DRI_CONF_OPT_BEGIN_B(float_depth, def) \
-        DRI_CONF_DESC(en,"Floating point depth buffer") \
-        DRI_CONF_DESC(ca,"Buffer de profunditat de punt flotant") \
-        DRI_CONF_DESC(de,"Fließkomma z-Puffer") \
-        DRI_CONF_DESC(es,"Búfer de profundidad en coma flotante") \
-        DRI_CONF_DESC(nl,"Dieptebuffer als commagetal") \
-        DRI_CONF_DESC(fr,"Z-buffer en virgule flottante") \
-        DRI_CONF_DESC(sv,"Buffert för flytande punktdjup") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PP_CELSHADE(def) \
-DRI_CONF_OPT_BEGIN_V(pp_celshade,enum,def,"0:1") \
-        DRI_CONF_DESC(en,"A post-processing filter to cel-shade the output") \
-        DRI_CONF_DESC(ca,"Un filtre de postprocessament per a aplicar cel shading a la sortida") \
-        DRI_CONF_DESC(de,"Nachbearbeitungsfilter für Cell Shading") \
-        DRI_CONF_DESC(es,"Un filtro de postprocesamiento para aplicar cel shading a la salida") \
-        DRI_CONF_DESC(nl,"A post-processing filter to cel-shade the output") \
-        DRI_CONF_DESC(fr,"A post-processing filter to cel-shade the output") \
-        DRI_CONF_DESC(sv,"A post-processing filter to cel-shade the output") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PP_NORED(def) \
-DRI_CONF_OPT_BEGIN_V(pp_nored,enum,def,"0:1") \
-        DRI_CONF_DESC(en,"A post-processing filter to remove the red channel") \
-        DRI_CONF_DESC(ca,"Un filtre de postprocessament per a eliminar el canal vermell") \
-        DRI_CONF_DESC(de,"Nachbearbeitungsfilter zum Entfernen des Rotkanals") \
-        DRI_CONF_DESC(es,"Un filtro de postprocesamiento para eliminar el canal rojo") \
-        DRI_CONF_DESC(nl,"A post-processing filter to remove the red channel") \
-        DRI_CONF_DESC(fr,"A post-processing filter to remove the red channel") \
-        DRI_CONF_DESC(sv,"A post-processing filter to remove the red channel") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PP_NOGREEN(def) \
-DRI_CONF_OPT_BEGIN_V(pp_nogreen,enum,def,"0:1") \
-        DRI_CONF_DESC(en,"A post-processing filter to remove the green channel") \
-        DRI_CONF_DESC(ca,"Un filtre de postprocessament per a eliminar el canal verd") \
-        DRI_CONF_DESC(de,"Nachbearbeitungsfilter zum Entfernen des Grünkanals") \
-        DRI_CONF_DESC(es,"Un filtro de postprocesamiento para eliminar el canal verde") \
-        DRI_CONF_DESC(nl,"A post-processing filter to remove the green channel") \
-        DRI_CONF_DESC(fr,"A post-processing filter to remove the green channel") \
-        DRI_CONF_DESC(sv,"A post-processing filter to remove the green channel") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PP_NOBLUE(def) \
-DRI_CONF_OPT_BEGIN_V(pp_noblue,enum,def,"0:1") \
-        DRI_CONF_DESC(en,"A post-processing filter to remove the blue channel") \
-        DRI_CONF_DESC(ca,"Un filtre de postprocessament per a eliminar el canal blau") \
-        DRI_CONF_DESC(de,"Nachbearbeitungsfilter zum Entfernen des Blaukanals") \
-        DRI_CONF_DESC(es,"Un filtro de postprocesamiento para eliminar el canal azul") \
-        DRI_CONF_DESC(nl,"A post-processing filter to remove the blue channel") \
-        DRI_CONF_DESC(fr,"A post-processing filter to remove the blue channel") \
-        DRI_CONF_DESC(sv,"A post-processing filter to remove the blue channel") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PP_JIMENEZMLAA(def,min,max) \
-DRI_CONF_OPT_BEGIN_V(pp_jimenezmlaa,int,def, # min ":" # max ) \
-        DRI_CONF_DESC(en,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality") \
-        DRI_CONF_DESC(ca,"Antialiàsing morfològic basat en el MLAA de Jimenez. 0 per deshabilitar, 8 per qualitat per defecte") \
-        DRI_CONF_DESC(de,"Morphologische Kantenglättung (Anti-Aliasing) basierend auf Jimenez' MLAA. 0 für deaktiviert, 8 für Standardqualität") \
-        DRI_CONF_DESC(es,"Antialiasing morfológico basado en el MLAA de Jimenez. 0 para deshabilitar, 8 para calidad por defecto") \
-        DRI_CONF_DESC(nl,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality") \
-        DRI_CONF_DESC(fr,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality") \
-        DRI_CONF_DESC(sv,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PP_JIMENEZMLAA_COLOR(def,min,max) \
-DRI_CONF_OPT_BEGIN_V(pp_jimenezmlaa_color,int,def, # min ":" # max ) \
-        DRI_CONF_DESC(en,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality. Color version, usable with 2d GL apps") \
-        DRI_CONF_DESC(ca,"Antialiàsing morfològic basat en el MLAA de Jimenez. 0 per deshabilitar, 8 per qualitat per defecte. Versió en color, utilitzable amb les aplicacions GL 2D") \
-        DRI_CONF_DESC(de,"Morphologische Kantenglättung (Anti-Aliasing) basierend auf Jimenez' MLAA. 0 für deaktiviert, 8 für Standardqualität. Farbversion, für 2D-Anwendungen") \
-        DRI_CONF_DESC(es,"Antialiasing morfológico basado en el MLAA de Jimenez. 0 para deshabilitar, 8 para calidad por defecto. Versión en color, usable con aplicaciones GL 2D") \
-        DRI_CONF_DESC(nl,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality. Color version, usable with 2d GL apps") \
-        DRI_CONF_DESC(fr,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality. Color version, usable with 2d GL apps") \
-        DRI_CONF_DESC(sv,"Morphological anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default quality. Color version, usable with 2d GL apps") \
-DRI_CONF_OPT_END
-
-
-
-/**
- * \brief Performance-related options
- */
-#define DRI_CONF_SECTION_PERFORMANCE \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,"Performance") \
-        DRI_CONF_DESC(ca,"Rendiment") \
-        DRI_CONF_DESC(de,"Leistung") \
-        DRI_CONF_DESC(es,"Rendimiento") \
-        DRI_CONF_DESC(nl,"Prestatie") \
-        DRI_CONF_DESC(fr,"Performance") \
-        DRI_CONF_DESC(sv,"Prestanda")
-
-#define DRI_CONF_TCL_SW 0
-#define DRI_CONF_TCL_PIPELINED 1
-#define DRI_CONF_TCL_VTXFMT 2
-#define DRI_CONF_TCL_CODEGEN 3
-#define DRI_CONF_TCL_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(tcl_mode,enum,def,"0:3") \
-        DRI_CONF_DESC_BEGIN(en,"TCL mode (Transformation, Clipping, Lighting)") \
-                DRI_CONF_ENUM(0,"Use software TCL pipeline") \
-                DRI_CONF_ENUM(1,"Use hardware TCL as first TCL pipeline stage") \
-                DRI_CONF_ENUM(2,"Bypass the TCL pipeline") \
-                DRI_CONF_ENUM(3,"Bypass the TCL pipeline with state-based machine code generated on-the-fly") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(ca,"Mode TCL (Transformació, Retall, Il·luminació)") \
-                DRI_CONF_ENUM(0,"Utilitza la canonada TCL de programari") \
-                DRI_CONF_ENUM(1,"Utilitza el TCL de maquinari com a la primera fase de la canonada TCL") \
-                DRI_CONF_ENUM(2,"Passa per alt la canonada TCL") \
-                DRI_CONF_ENUM(3,"Passa per alt la canonada TCL amb codi de màquina basat en estats, generat sobre la marxa") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(de,"TCL-Modus (Transformation, Clipping, Licht)") \
-                DRI_CONF_ENUM(0,"Benutze die Software-TCL-Pipeline") \
-                DRI_CONF_ENUM(1,"Benutze Hardware TCL als erste Stufe der TCL-Pipeline") \
-                DRI_CONF_ENUM(2,"Umgehe die TCL-Pipeline") \
-                DRI_CONF_ENUM(3,"Umgehe die TCL-Pipeline mit zur Laufzeit erzeugtem, zustandsbasiertem Maschinencode") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(es,"Modo TCL (Transformación, Recorte, Iluminación)") \
-                DRI_CONF_ENUM(0,"Usar tubería TCL por software") \
-                DRI_CONF_ENUM(1,"Usar TCL por hardware en la primera fase de la tubería TCL") \
-                DRI_CONF_ENUM(2,"Pasar por alto la tubería TCL") \
-                DRI_CONF_ENUM(3,"Pasar por alto la tubería TCL con código máquina basado en estados, generado al vuelo") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(nl,"TCL-modus (Transformatie, Clipping, Licht)") \
-                DRI_CONF_ENUM(0,"Gebruik software TCL pijpleiding") \
-                DRI_CONF_ENUM(1,"Gebruik hardware TCL as eerste TCL pijpleiding trap") \
-                DRI_CONF_ENUM(2,"Omzeil de TCL pijpleiding") \
-                DRI_CONF_ENUM(3,"Omzeil de TCL pijpleiding met staatgebaseerde machinecode die tijdens executie gegenereerd wordt") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(fr,"Mode de TCL (Transformation, Clipping, Eclairage)") \
-                DRI_CONF_ENUM(0,"Utiliser un pipeline TCL logiciel") \
-                DRI_CONF_ENUM(1,"Utiliser le TCL matériel pour le premier niveau de pipeline") \
-                DRI_CONF_ENUM(2,"Court-circuiter le pipeline TCL") \
-                DRI_CONF_ENUM(3,"Court-circuiter le pipeline TCL par une machine à états qui génère le codede TCL à la volée") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(sv,"TCL-läge (Transformation, Clipping, Lighting)") \
-                DRI_CONF_ENUM(0,"Använd programvaru-TCL-rörledning") \
-                DRI_CONF_ENUM(1,"Använd maskinvaru-TCL som första TCL-rörledningssteg") \
-                DRI_CONF_ENUM(2,"Kringgå TCL-rörledningen") \
-                DRI_CONF_ENUM(3,"Kringgå TCL-rörledningen med tillståndsbaserad maskinkod som direktgenereras") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FTHROTTLE_BUSY 0
-#define DRI_CONF_FTHROTTLE_USLEEPS 1
-#define DRI_CONF_FTHROTTLE_IRQS 2
-#define DRI_CONF_FTHROTTLE_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(fthrottle_mode,enum,def,"0:2") \
-        DRI_CONF_DESC_BEGIN(en,"Method to limit rendering latency") \
-                DRI_CONF_ENUM(0,"Busy waiting for the graphics hardware") \
-                DRI_CONF_ENUM(1,"Sleep for brief intervals while waiting for the graphics hardware") \
-                DRI_CONF_ENUM(2,"Let the graphics hardware emit a software interrupt and sleep") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(ca,"Mètode per a limitar la latència de renderització") \
-                DRI_CONF_ENUM(0,"Espera activa pel maquinari de gràfics") \
-                DRI_CONF_ENUM(1,"Dorm per intervals breus mentre s'espera al maquinari de gràfics") \
-                DRI_CONF_ENUM(2,"Deixa que el maquinari de gràfics emeti una interrupció de programari i dormi") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(de,"Methode zur Begrenzung der Bildverzögerung") \
-                DRI_CONF_ENUM(0,"Aktives Warten auf die Grafikhardware") \
-                DRI_CONF_ENUM(1,"Kurze Schlafintervalle beim Warten auf die Grafikhardware") \
-                DRI_CONF_ENUM(2,"Die Grafikhardware eine Softwareunterbrechnung erzeugen lassen und schlafen") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(es,"Método para limitar la latencia de renderización") \
-                DRI_CONF_ENUM(0,"Esperar activamente al hardware gráfico") \
-                DRI_CONF_ENUM(1,"Dormir en intervalos cortos mientras se espera al hardware gráfico") \
-                DRI_CONF_ENUM(2,"Permitir que el hardware gráfico emita una interrupción de software y duerma") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(nl,"Methode om beeldopbouwvertraging te onderdrukken") \
-                DRI_CONF_ENUM(0,"Actief wachten voor de grafische hardware") \
-                DRI_CONF_ENUM(1,"Slaap voor korte intervallen tijdens het wachten op de grafische hardware") \
-                DRI_CONF_ENUM(2,"Laat de grafische hardware een software onderbreking uitzenden en in slaap vallen") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(fr,"Méthode d'attente de la carte graphique") \
-                DRI_CONF_ENUM(0,"Attente active de la carte graphique") \
-                DRI_CONF_ENUM(1,"Attente utilisant usleep()") \
-                DRI_CONF_ENUM(2,"Utiliser les interruptions") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(sv,"Metod för att begränsa renderingslatens") \
-                DRI_CONF_ENUM(0,"Upptagen med att vänta på grafikhårdvaran") \
-                DRI_CONF_ENUM(1,"Sov i korta intervall under väntan på grafikhårdvaran") \
-                DRI_CONF_ENUM(2,"Låt grafikhårdvaran sända ut ett programvaruavbrott och sov") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_VBLANK_NEVER 0
-#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
-#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
-#define DRI_CONF_VBLANK_ALWAYS_SYNC 3
-#define DRI_CONF_VBLANK_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(vblank_mode,enum,def,"0:3") \
-        DRI_CONF_DESC_BEGIN(en,"Synchronization with vertical refresh (swap intervals)") \
-                DRI_CONF_ENUM(0,"Never synchronize with vertical refresh, ignore application's choice") \
-                DRI_CONF_ENUM(1,"Initial swap interval 0, obey application's choice") \
-                DRI_CONF_ENUM(2,"Initial swap interval 1, obey application's choice") \
-                DRI_CONF_ENUM(3,"Always synchronize with vertical refresh, application chooses the minimum swap interval") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(ca,"Sincronització amb refresc vertical (intervals d'intercanvi)") \
-                DRI_CONF_ENUM(0,"Mai sincronitzis amb el refresc vertical, ignora l'elecció de l'aplicació") \
-                DRI_CONF_ENUM(1,"Interval d'intercanvi inicial 0, obeeix l'elecció de l'aplicació") \
-                DRI_CONF_ENUM(2,"Interval d'intercanvi inicial 1, obeeix l'elecció de l'aplicació") \
-                DRI_CONF_ENUM(3,"Sempre sincronitza amb el refresc vertical, l'aplicació tria l'interval mínim d'intercanvi") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(de,"Synchronisation mit der vertikalen Bildwiederholung") \
-                DRI_CONF_ENUM(0,"Niemals mit der Bildwiederholung synchronisieren, Anweisungen der Anwendung ignorieren") \
-                DRI_CONF_ENUM(1,"Initiales Bildinterval 0, Anweisungen der Anwendung gehorchen") \
-                DRI_CONF_ENUM(2,"Initiales Bildinterval 1, Anweisungen der Anwendung gehorchen") \
-                DRI_CONF_ENUM(3,"Immer mit der Bildwiederholung synchronisieren, Anwendung wählt das minimale Bildintervall") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(es,"Sincronización con el refresco vertical (intervalos de intercambio)") \
-                DRI_CONF_ENUM(0,"No sincronizar nunca con el refresco vertical, ignorar la elección de la aplicación") \
-                DRI_CONF_ENUM(1,"Intervalo de intercambio inicial 0, obedecer la elección de la aplicación") \
-                DRI_CONF_ENUM(2,"Intervalo de intercambio inicial 1, obedecer la elección de la aplicación") \
-                DRI_CONF_ENUM(3,"Sincronizar siempre con el refresco vertical, la aplicación elige el intervalo de intercambio mínimo") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(nl,"Synchronisatie met verticale verversing (interval omwisselen)") \
-                DRI_CONF_ENUM(0,"Nooit synchroniseren met verticale verversing, negeer de keuze van de applicatie") \
-                DRI_CONF_ENUM(1,"Initïeel omwisselingsinterval 0, honoreer de keuze van de applicatie") \
-                DRI_CONF_ENUM(2,"Initïeel omwisselingsinterval 1, honoreer de keuze van de applicatie") \
-                DRI_CONF_ENUM(3,"Synchroniseer altijd met verticale verversing, de applicatie kiest het minimum omwisselingsinterval") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(fr,"Synchronisation de l'affichage avec le balayage vertical") \
-                DRI_CONF_ENUM(0,"Ne jamais synchroniser avec le balayage vertical, ignorer le choix de l'application") \
-                DRI_CONF_ENUM(1,"Ne pas synchroniser avec le balayage vertical par défaut, mais obéir au choix de l'application") \
-                DRI_CONF_ENUM(2,"Synchroniser avec le balayage vertical par défaut, mais obéir au choix de l'application") \
-                DRI_CONF_ENUM(3,"Toujours synchroniser avec le balayage vertical, l'application choisit l'intervalle minimal") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(sv,"Synkronisering med vertikal uppdatering (växlingsintervall)") \
-                DRI_CONF_ENUM(0,"Synkronisera aldrig med vertikal uppdatering, ignorera programmets val") \
-                DRI_CONF_ENUM(1,"Initialt växlingsintervall 0, följ programmets val") \
-                DRI_CONF_ENUM(2,"Initialt växlingsintervall 1, följ programmets val") \
-                DRI_CONF_ENUM(3,"Synkronisera alltid med vertikal uppdatering, programmet väljer den minsta växlingsintervallen") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_HYPERZ_DISABLED 0
-#define DRI_CONF_HYPERZ_ENABLED 1
-#define DRI_CONF_HYPERZ(def) \
-DRI_CONF_OPT_BEGIN_B(hyperz, def) \
-        DRI_CONF_DESC(en,"Use HyperZ to boost performance") \
-        DRI_CONF_DESC(ca,"Utilitza el HyperZ per a augmentar el rendiment") \
-        DRI_CONF_DESC(de,"HyperZ zur Leistungssteigerung verwenden") \
-        DRI_CONF_DESC(es,"Usar HyperZ para potenciar rendimiento") \
-        DRI_CONF_DESC(nl,"Gebruik HyperZ om de prestaties te verbeteren") \
-        DRI_CONF_DESC(fr,"Utiliser le HyperZ pour améliorer les performances") \
-        DRI_CONF_DESC(sv,"Använd HyperZ för att maximera prestandan") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_MAX_TEXTURE_UNITS(def,min,max) \
-DRI_CONF_OPT_BEGIN_V(texture_units,int,def, # min ":" # max ) \
-        DRI_CONF_DESC(en,"Number of texture units used") \
-        DRI_CONF_DESC(ca,"Nombre d'unitats de textura utilitzades") \
-        DRI_CONF_DESC(de,"Anzahl der benutzten Textureinheiten") \
-        DRI_CONF_DESC(es,"Número de unidades de textura usadas") \
-        DRI_CONF_DESC(nl,"Aantal textuureenheden in gebruik") \
-        DRI_CONF_DESC(fr,"Nombre d'unités de texture") \
-        DRI_CONF_DESC(sv,"Antal använda texturenheter") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_TEXTURE_BLEND_QUALITY(def,range) \
-DRI_CONF_OPT_BEGIN_V(texture_blend_quality,float,def,range) \
-	DRI_CONF_DESC(en,"Texture filtering quality vs. speed, AKA “brilinear” texture filtering") \
-	DRI_CONF_DESC(ca,"Qualitat vs. velocitat de filtració de textura, àlies filtració ”brilinear“ de textura") \
-	DRI_CONF_DESC(de,"Texturfilterqualität versus -geschwindigkeit, auch bekannt als „brilineare“ Texturfilterung") \
-	DRI_CONF_DESC(es,"Calidad de filtrado de textura vs. velocidad, alias filtrado ”brilinear“ de textura") \
-	DRI_CONF_DESC(nl,"Textuurfilterkwaliteit versus -snelheid, ookwel bekend als “brilineaire” textuurfiltering") \
-	DRI_CONF_DESC(fr,"Qualité/performance du filtrage trilinéaire de texture (filtrage brilinéaire)") \
-	DRI_CONF_DESC(sv,"Texturfiltreringskvalitet mot hastighet, även kallad ”brilinear”-texturfiltrering") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_TEXTURE_HEAPS_ALL 0
-#define DRI_CONF_TEXTURE_HEAPS_CARD 1
-#define DRI_CONF_TEXTURE_HEAPS_GART 2
-#define DRI_CONF_TEXTURE_HEAPS(def) \
-DRI_CONF_OPT_BEGIN_V(texture_heaps,enum,def,"0:2") \
-	DRI_CONF_DESC_BEGIN(en,"Used types of texture memory") \
-		DRI_CONF_ENUM(0,"All available memory") \
-		DRI_CONF_ENUM(1,"Only card memory (if available)") \
-		DRI_CONF_ENUM(2,"Only GART (AGP/PCIE) memory (if available)") \
-	DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(ca,"Tipus utilitzats de memòria de textura") \
-		DRI_CONF_ENUM(0,"Tota la memòria disponible") \
-		DRI_CONF_ENUM(1,"Només memòria de targeta (si està disponible)") \
-		DRI_CONF_ENUM(2,"Només memòria GART (AGP/PCIE) (si està disponible)") \
-	DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(de,"Benutzte Arten von Texturspeicher") \
-		DRI_CONF_ENUM(0,"Aller verfügbarer Speicher") \
-		DRI_CONF_ENUM(1,"Nur Grafikspeicher (falls verfügbar)") \
-		DRI_CONF_ENUM(2,"Nur GART-Speicher (AGP/PCIE) (falls verfügbar)") \
-	DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(es,"Tipos de memoria de textura usados") \
-		DRI_CONF_ENUM(0,"Toda la memoria disponible") \
-		DRI_CONF_ENUM(1,"Solo memoria de tarjeta (si está disponible)") \
-		DRI_CONF_ENUM(2,"Solo memoria GART (AGP/PCIE) (si está disponible)") \
-	DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(nl,"Gebruikte soorten textuurgeheugen") \
-		DRI_CONF_ENUM(0,"Al het beschikbaar geheugen") \
-		DRI_CONF_ENUM(1,"Alleen geheugen op de kaart (als het aanwezig is)") \
-		DRI_CONF_ENUM(2,"Alleen GART (AGP/PCIE) geheugen (als het aanwezig is)") \
-	DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(fr,"Types de mémoire de texture") \
-		DRI_CONF_ENUM(0,"Utiliser toute la mémoire disponible") \
-		DRI_CONF_ENUM(1,"Utiliser uniquement la mémoire graphique (si disponible)") \
-		DRI_CONF_ENUM(2,"Utiliser uniquement la mémoire GART (AGP/PCIE) (si disponible)") \
-	DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(sv,"Använda typer av texturminne") \
-		DRI_CONF_ENUM(0,"Allt tillgängligt minne") \
-		DRI_CONF_ENUM(1,"Endast kortminne (om tillgängligt)") \
-		DRI_CONF_ENUM(2,"Endast GART-minne (AGP/PCIE) (om tillgängligt)") \
-	DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_MESA_GLTHREAD(def) \
-DRI_CONF_OPT_BEGIN_B(mesa_glthread, def) \
-        DRI_CONF_DESC(en,"Enable offloading GL driver work to a separate thread") \
-        DRI_CONF_DESC(ca,"Enable offloading GL driver work to a separate thread") \
-        DRI_CONF_DESC(de,"Enable offloading GL driver work to a separate thread") \
-        DRI_CONF_DESC(es,"Enable offloading GL driver work to a separate thread") \
-        DRI_CONF_DESC(nl,"Enable offloading GL driver work to a separate thread") \
-        DRI_CONF_DESC(fr,"Enable offloading GL driver work to a separate thread") \
-        DRI_CONF_DESC(sv,"Enable offloading GL driver work to a separate thread") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_MESA_NO_ERROR(def) \
-DRI_CONF_OPT_BEGIN_B(mesa_no_error, def) \
-        DRI_CONF_DESC(en,"Disable GL driver error checking") \
-        DRI_CONF_DESC(ca,"Disable GL driver error checking") \
-        DRI_CONF_DESC(de,"Disable GL driver error checking") \
-        DRI_CONF_DESC(es,"Disable GL driver error checking") \
-        DRI_CONF_DESC(nl,"Disable GL driver error checking") \
-        DRI_CONF_DESC(fr,"Disable GL driver error checking") \
-        DRI_CONF_DESC(sv,"Disable GL driver error checking") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_EXT_BUFFER_AGE(def) \
-DRI_CONF_OPT_BEGIN_B(glx_disable_ext_buffer_age, def) \
-   DRI_CONF_DESC(en, "Disable the GLX_EXT_buffer_age extension") \
-   DRI_CONF_DESC(ca, "Disable the GLX_EXT_buffer_age extension") \
-   DRI_CONF_DESC(de, "Disable the GLX_EXT_buffer_age extension") \
-   DRI_CONF_DESC(es, "Disable the GLX_EXT_buffer_age extension") \
-   DRI_CONF_DESC(nl, "Disable the GLX_EXT_buffer_age extension") \
-   DRI_CONF_DESC(fr, "Disable the GLX_EXT_buffer_age extension") \
-   DRI_CONF_DESC(sv, "Disable the GLX_EXT_buffer_age extension") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_OML_SYNC_CONTROL(def) \
-DRI_CONF_OPT_BEGIN_B(glx_disable_oml_sync_control, def) \
-   DRI_CONF_DESC(en, "Disable the GLX_OML_sync_control extension") \
-   DRI_CONF_DESC(ca, "Disable the GLX_OML_sync_control extension") \
-   DRI_CONF_DESC(de, "Disable the GLX_OML_sync_control extension") \
-   DRI_CONF_DESC(es, "Disable the GLX_OML_sync_control extension") \
-   DRI_CONF_DESC(nl, "Disable the GLX_OML_sync_control extension") \
-   DRI_CONF_DESC(fr, "Disable the GLX_OML_sync_control extension") \
-   DRI_CONF_DESC(sv, "Disable the GLX_OML_sync_control extension") \
-DRI_CONF_OPT_END
-
-
-/**
- * \brief Software-fallback options.  To allow using features (like
- * GL_ARB_vertex_program) on GPUs that don't otherwise support the feature.
- */
-#define DRI_CONF_SECTION_SOFTWARE \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,"Features that are not hardware-accelerated") \
-        DRI_CONF_DESC(ca,"Característiques no accelerades per maquinari") \
-        DRI_CONF_DESC(de,"Funktionalität, die nicht hardwarebeschleunigt ist") \
-        DRI_CONF_DESC(es,"Características no aceleradas por hardware") \
-        DRI_CONF_DESC(nl,"Eigenschappen die niet hardwareversneld zijn") \
-        DRI_CONF_DESC(fr,"Fonctionnalités ne bénéficiant pas d'une accélération matérielle") \
-        DRI_CONF_DESC(sv,"Funktioner som inte är hårdvaruaccelererade")
-
-#define DRI_CONF_ARB_VERTEX_PROGRAM(def) \
-DRI_CONF_OPT_BEGIN_B(arb_vertex_program, def) \
-        DRI_CONF_DESC(en,"Enable extension GL_ARB_vertex_program") \
-        DRI_CONF_DESC(ca,"Habilita l'extensió GL_ARB_vertex_program") \
-        DRI_CONF_DESC(de,"Erweiterung GL_ARB_vertex_program aktivieren") \
-        DRI_CONF_DESC(es,"Habilitar la extensión GL_ARB_vertex_program") \
-        DRI_CONF_DESC(nl,"Zet uitbreiding GL_ARB_vertex_program aan") \
-        DRI_CONF_DESC(fr,"Activer l'extension GL_ARB_vertex_program") \
-        DRI_CONF_DESC(sv,"Aktivera tillägget GL_ARB_vertex_program") \
-DRI_CONF_OPT_END
-
-
-
-/**
- * \brief Miscellaneous configuration options
- */
-#define DRI_CONF_SECTION_MISCELLANEOUS \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,"Miscellaneous") \
-        DRI_CONF_DESC(ca,"Miscel·lània") \
-        DRI_CONF_DESC(de,"Miscellaneous") \
-        DRI_CONF_DESC(es,"Misceláneos") \
-        DRI_CONF_DESC(nl,"Miscellaneous") \
-        DRI_CONF_DESC(fr,"Miscellaneous") \
-        DRI_CONF_DESC(sv,"Miscellaneous")
-
-#define DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER(def) \
-DRI_CONF_OPT_BEGIN_B(always_have_depth_buffer, def) \
-        DRI_CONF_DESC(en,"Create all visuals with a depth buffer") \
-        DRI_CONF_DESC(ca,"Crea tots els visuals amb buffer de profunditat") \
-        DRI_CONF_DESC(de,"Create all visuals with a depth buffer") \
-        DRI_CONF_DESC(es,"Crear todos los visuales con búfer de profundidad") \
-        DRI_CONF_DESC(nl,"Create all visuals with a depth buffer") \
-        DRI_CONF_DESC(fr,"Create all visuals with a depth buffer") \
-        DRI_CONF_DESC(sv,"Create all visuals with a depth buffer") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_GLSL_ZERO_INIT(def) \
-DRI_CONF_OPT_BEGIN_B(glsl_zero_init, def) \
-        DRI_CONF_DESC(en,"Force uninitialized variables to default to zero") \
-        DRI_CONF_DESC(ca,"Force uninitialized variables to default to zero") \
-        DRI_CONF_DESC(de,"Force uninitialized variables to default to zero") \
-        DRI_CONF_DESC(es,"Force uninitialized variables to default to zero") \
-        DRI_CONF_DESC(nl,"Force uninitialized variables to default to zero") \
-        DRI_CONF_DESC(fr,"Force uninitialized variables to default to zero") \
-        DRI_CONF_DESC(sv,"Force uninitialized variables to default to zero") \
-DRI_CONF_OPT_END
-
-/**
- * \brief Initialization configuration options
- */
-#define DRI_CONF_SECTION_INITIALIZATION \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,"Initialization") \
-        DRI_CONF_DESC(ca,"Inicialització") \
-        DRI_CONF_DESC(de,"Initialization") \
-        DRI_CONF_DESC(es,"Inicialización") \
-        DRI_CONF_DESC(nl,"Initialization") \
-        DRI_CONF_DESC(fr,"Initialization") \
-        DRI_CONF_DESC(sv,"Initialization")
-
-#define DRI_CONF_DEVICE_ID_PATH_TAG(def) \
-DRI_CONF_OPT_BEGIN(device_id, string, def) \
-        DRI_CONF_DESC(en,"Define the graphic device to use if possible") \
-        DRI_CONF_DESC(ca,"Defineix el dispositiu de gràfics que utilitzar si és possible") \
-        DRI_CONF_DESC(de,"Define the graphic device to use if possible") \
-        DRI_CONF_DESC(es,"Define el dispositivo de gráficos que usar si es posible") \
-        DRI_CONF_DESC(nl,"Define the graphic device to use if possible") \
-        DRI_CONF_DESC(fr,"Define the graphic device to use if possible") \
-        DRI_CONF_DESC(sv,"Define the graphic device to use if possible") \
-DRI_CONF_OPT_END
-
-/**
- * \brief Gallium-Nine specific configuration options
- */
-
-#define DRI_CONF_SECTION_NINE \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,"Gallium Nine") \
-        DRI_CONF_DESC(ca,"Gallium Nine") \
-        DRI_CONF_DESC(de,"Gallium Nine") \
-        DRI_CONF_DESC(es,"Gallium Nine") \
-        DRI_CONF_DESC(nl,"Gallium Nine") \
-        DRI_CONF_DESC(fr,"Gallium Nine") \
-        DRI_CONF_DESC(sv,"Gallium Nine")
-
-#define DRI_CONF_NINE_THROTTLE(def) \
-DRI_CONF_OPT_BEGIN(throttle_value, int, def) \
-        DRI_CONF_DESC(en,"Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour") \
-        DRI_CONF_DESC(ca,"Defineix el valor de regulació. -1 per a no regular, -2 per al predeterminat (generalment 2), 0 per al comportament de glfinish") \
-        DRI_CONF_DESC(de,"Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour") \
-        DRI_CONF_DESC(es,"Define el valor de regulación. -1 para no regular, -2 para el por defecto (generalmente 2), 0 para el comportamiento de glfinish") \
-        DRI_CONF_DESC(nl,"Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour") \
-        DRI_CONF_DESC(fr,"Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour") \
-        DRI_CONF_DESC(sv,"Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_NINE_THREADSUBMIT(def) \
-DRI_CONF_OPT_BEGIN_B(thread_submit, def) \
-        DRI_CONF_DESC(en,"Use an additional thread to submit buffers.") \
-        DRI_CONF_DESC(ca,"Utilitza un fil addicional per a entregar els buffers.") \
-        DRI_CONF_DESC(de,"Use an additional thread to submit buffers.") \
-        DRI_CONF_DESC(es,"Usar un hilo adicional para entregar los búfer.") \
-        DRI_CONF_DESC(nl,"Use an additional thread to submit buffers.") \
-        DRI_CONF_DESC(fr,"Use an additional thread to submit buffers.") \
-        DRI_CONF_DESC(sv,"Use an additional thread to submit buffers.") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_NINE_OVERRIDEVENDOR(def) \
-DRI_CONF_OPT_BEGIN(override_vendorid, int, def) \
-        DRI_CONF_DESC(en,"Define the vendor_id to report. This allows faking another hardware vendor.") \
-        DRI_CONF_DESC(ca,"Define the vendor_id to report. This allows faking another hardware vendor.") \
-        DRI_CONF_DESC(de,"Define the vendor_id to report. This allows faking another hardware vendor.") \
-        DRI_CONF_DESC(es,"Define the vendor_id to report. This allows faking another hardware vendor.") \
-        DRI_CONF_DESC(nl,"Define the vendor_id to report. This allows faking another hardware vendor.") \
-        DRI_CONF_DESC(fr,"Define the vendor_id to report. This allows faking another hardware vendor.") \
-        DRI_CONF_DESC(sv,"Define the vendor_id to report. This allows faking another hardware vendor.") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_NINE_ALLOWDISCARDDELAYEDRELEASE(def) \
-DRI_CONF_OPT_BEGIN_B(discard_delayed_release, def) \
-        DRI_CONF_DESC(en,"Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \
-        DRI_CONF_DESC(ca,"Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \
-        DRI_CONF_DESC(de,"Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \
-        DRI_CONF_DESC(es,"Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \
-        DRI_CONF_DESC(nl,"Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \
-        DRI_CONF_DESC(fr,"Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \
-        DRI_CONF_DESC(sv,"Whether to allow the display server to release buffers with a delay when using d3d's presentation mode DISCARD. Default to true. Set to false if suffering from lag (thread_submit=true can also help in this situation).") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_NINE_TEARFREEDISCARD(def) \
-DRI_CONF_OPT_BEGIN_B(tearfree_discard, def) \
-        DRI_CONF_DESC(en,"Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \
-        DRI_CONF_DESC(ca,"Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \
-        DRI_CONF_DESC(de,"Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \
-        DRI_CONF_DESC(es,"Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \
-        DRI_CONF_DESC(nl,"Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \
-        DRI_CONF_DESC(fr,"Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \
-        DRI_CONF_DESC(sv,"Whether to make d3d's presentation mode DISCARD (games usually use that mode) Tear Free. If rendering above screen refresh, some frames will get skipped. false by default.") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_NINE_CSMT(def) \
-DRI_CONF_OPT_BEGIN(csmt_force, int, def) \
-        DRI_CONF_DESC(en,"If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \
-        DRI_CONF_DESC(ca,"If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \
-        DRI_CONF_DESC(de,"If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \
-        DRI_CONF_DESC(es,"If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \
-        DRI_CONF_DESC(nl,"If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \
-        DRI_CONF_DESC(fr,"If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \
-        DRI_CONF_DESC(sv,"If set to 1, force gallium nine CSMT. If set to 0, disable it. By default (-1) CSMT is enabled on known thread-safe drivers.") \
-DRI_CONF_OPT_END
-
-/**
- * \brief radeonsi specific configuration options
- */
-
-#define DRI_CONF_RADEONSI_ENABLE_SISCHED(def) \
-DRI_CONF_OPT_BEGIN_B(radeonsi_enable_sisched, def) \
-        DRI_CONF_DESC(en,"Use the LLVM sisched option for shader compiles") \
-        DRI_CONF_DESC(ca,"Use the LLVM sisched option for shader compiles") \
-        DRI_CONF_DESC(de,"Use the LLVM sisched option for shader compiles") \
-        DRI_CONF_DESC(es,"Use the LLVM sisched option for shader compiles") \
-        DRI_CONF_DESC(nl,"Use the LLVM sisched option for shader compiles") \
-        DRI_CONF_DESC(fr,"Use the LLVM sisched option for shader compiles") \
-        DRI_CONF_DESC(sv,"Use the LLVM sisched option for shader compiles") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_RADEONSI_ASSUME_NO_Z_FIGHTS(def) \
-DRI_CONF_OPT_BEGIN_B(radeonsi_assume_no_z_fights, def) \
-        DRI_CONF_DESC(en,"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \
-        DRI_CONF_DESC(ca,"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \
-        DRI_CONF_DESC(de,"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \
-        DRI_CONF_DESC(es,"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \
-        DRI_CONF_DESC(nl,"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \
-        DRI_CONF_DESC(fr,"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \
-        DRI_CONF_DESC(sv,"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_RADEONSI_COMMUTATIVE_BLEND_ADD(def) \
-DRI_CONF_OPT_BEGIN_B(radeonsi_commutative_blend_add, def) \
-        DRI_CONF_DESC(en,"Commutative additive blending optimizations (may cause rendering errors)") \
-        DRI_CONF_DESC(ca,"Commutative additive blending optimizations (may cause rendering errors)") \
-        DRI_CONF_DESC(de,"Commutative additive blending optimizations (may cause rendering errors)") \
-        DRI_CONF_DESC(es,"Commutative additive blending optimizations (may cause rendering errors)") \
-        DRI_CONF_DESC(nl,"Commutative additive blending optimizations (may cause rendering errors)") \
-        DRI_CONF_DESC(fr,"Commutative additive blending optimizations (may cause rendering errors)") \
-        DRI_CONF_DESC(sv,"Commutative additive blending optimizations (may cause rendering errors)") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_RADEONSI_CLEAR_DB_CACHE_BEFORE_CLEAR(def) \
-DRI_CONF_OPT_BEGIN_B(radeonsi_clear_db_cache_before_clear, def) \
-        DRI_CONF_DESC(en,"Clear DB cache before fast depth clear") \
-DRI_CONF_OPT_END
diff --git a/lib/mesa/src/util/xmlpool/sv.gmo b/lib/mesa/src/util/xmlpool/sv.gmo
deleted file mode 100644
index 8393f427e..000000000
--- a/lib/mesa/src/util/xmlpool/sv.gmo
+++ /dev/null