driconf: drop now unused translation facility

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5440>

11 files changed, 400 insertions, 788 deletions

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 02d29013d2b..1ed3816d189 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -66,58 +66,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
 LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
 
-MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
-LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
-
-
-#
-# Generate options.h from gettext translations.
-#
-
-MESA_DRI_OPTIONS_LANGS := 
-POT := $(intermediates)/xmlpool.pot
-
-$(POT): $(LOCAL_PATH)/xmlpool/t_options.h
-	@mkdir -p $(dir $@)
-	xgettext -L C --from-code utf-8 -o $@ $<
-
-$(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%.po): $(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT)
-	lang=$(basename $(notdir $@)); \
-	mkdir -p $(dir $@); \
-	if [ -f $< ]; then \
-		msgmerge -o $@ $^; \
-	else \
-		msginit -i $(POT) \
-			-o $@ \
-			--locale=$$lang \
-			--no-translator; \
-		sed -i -e 's/charset=.*\\n/charset=UTF-8\\n/' $@; \
-	fi
-
-PRIVATE_SCRIPT := $(LOCAL_PATH)/xmlpool/gen_xmlpool.py
-PRIVATE_LOCALEDIR := $(intermediates)/xmlpool
-PRIVATE_TEMPLATE_HEADER := $(LOCAL_PATH)/xmlpool/t_options.h
-PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%.gmo)
-
-LOCAL_GENERATED_SOURCES += $(PRIVATE_MO_FILES)
-
 $(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
-
-$(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%.gmo: $(intermediates)/xmlpool/%.po
-	mkdir -p $(dir $@)
-	msgfmt -o $@ $<
-
 $(UTIL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
 $(UTIL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/format/u_format.csv
 	$(transform-generated-source)
 
-$(MESA_DRI_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $< \
-		--template $(PRIVATE_TEMPLATE_HEADER) \
-		--output $@ \
-		--localedir $(PRIVATE_LOCALEDIR) \
-		--languages $(MESA_DRI_OPTIONS_LANGS)
-$(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
-	$(transform-generated-source)
-
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/util/SConscript b/src/util/SConscript
index f0437694347..972135812cb 100644
--- a/src/util/SConscript
+++ b/src/util/SConscript
@@ -10,7 +10,6 @@ env.MSVC2013Compat()
 
 env.Prepend(CPPPATH = [
     '#include',
-    xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
     '#src',
     '#src/mapi',
     '#src/mesa',
diff --git a/src/util/meson.build b/src/util/meson.build
index 2dbdd43d6b7..25c363ab95c 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -21,7 +21,6 @@
 inc_util = include_directories('.')
 
 subdir('format')
-subdir('xmlpool')
 
 files_mesa_util = files(
   'anon_file.h',
@@ -201,7 +200,7 @@ _libxmlconfig = static_library(
 )
 
 idep_xmlconfig = declare_dependency(
-  dependencies : [idep_xmlconfig_headers, dep_expat],
+  dependencies : dep_expat,
   link_with : _libxmlconfig,
 )
 
diff --git a/src/util/xmlpool.h b/src/util/xmlpool.h
index a1ec4f3a6c3..5875f46892a 100644
--- a/src/util/xmlpool.h
+++ b/src/util/xmlpool.h
@@ -27,10 +27,7 @@
  * \author Felix Kuehling
  *
  * This file defines macros that can be used to construct
- * driConfigOptions in the drivers. Common options are defined in
- * xmlpool/t_options.h from which xmlpool/options.h is generated with
- * translations. This file defines generic helper macros and includes
- * xmlpool/options.h.
+ * driConfigOptions in the drivers.
  */
 
 #ifndef __XMLPOOL_H
@@ -47,7 +44,7 @@
 "   <!ELEMENT driinfo      (section*)>" \
 "   <!ELEMENT section      (description+, option+)>" \
 "   <!ELEMENT description  (enum*)>" \
-"   <!ATTLIST description  lang CDATA #REQUIRED" \
+"   <!ATTLIST description  lang CDATA #FIXED \"en\"" \
 "                          text CDATA #REQUIRED>" \
 "   <!ELEMENT option       (description+)>" \
 "   <!ATTLIST option       name CDATA #REQUIRED" \
@@ -91,13 +88,13 @@
 #define DRI_CONF_OPT_END \
 "</option>\n"
 
-/** \brief A verbal description in a specified language (empty version) */
-#define DRI_CONF_DESC(lang,text) \
-"<description lang=\""#lang"\" text=\""text"\"/>\n"
+/** \brief A verbal description (empty version) */
+#define DRI_CONF_DESC(text) \
+"<description lang=\"en\" text=\""text"\"/>\n"
 
-/** \brief A verbal description in a specified language */
-#define DRI_CONF_DESC_BEGIN(lang,text) \
-"<description lang=\""#lang"\" text=\""text"\">\n"
+/** \brief Begining of a verbal description */
+#define DRI_CONF_DESC_BEGIN(text) \
+"<description lang=\"en\" text=\""text"\">\n"
 
 /** \brief End a description */
 #define DRI_CONF_DESC_END \
@@ -108,10 +105,397 @@
 "<enum value=\""#value"\" text=\""text"\"/>\n"
 
 
-/*
- * Predefined option sections and options with multi-lingual descriptions
- * are now automatically generated.
+/**
+ * \brief Debugging options
+ */
+#define DRI_CONF_SECTION_DEBUG \
+DRI_CONF_SECTION_BEGIN \
+        DRI_CONF_DESC("Debugging")
+
+#define DRI_CONF_ALWAYS_FLUSH_BATCH(def) \
+DRI_CONF_OPT_BEGIN_B(always_flush_batch, def) \
+        DRI_CONF_DESC("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("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("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("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("Disable dual source blending") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_DISABLE_ARB_GPU_SHADER5(def) \
+DRI_CONF_OPT_BEGIN_B(disable_arb_gpu_shader5, def) \
+        DRI_CONF_DESC("Disable GL_ARB_gpu_shader5") \
+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("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("Disable backslash-based line continuations in GLSL source") \
+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("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("Allow GLSL #extension directives in the middle of shaders") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ALLOW_GLSL_BUILTIN_CONST_EXPRESSION(def) \
+DRI_CONF_OPT_BEGIN_B(allow_glsl_builtin_const_expression, def) \
+        DRI_CONF_DESC("Allow builtins as part of constant expressions") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ALLOW_GLSL_RELAXED_ES(def) \
+DRI_CONF_OPT_BEGIN_B(allow_glsl_relaxed_es, def) \
+        DRI_CONF_DESC("Allow some relaxation of GLSL ES shader restrictions") \
+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("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("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("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("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("Allow interpolation qualifier mismatch across shader stages") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ALLOW_GLSL_LAYOUT_QUALIFIER_ON_FUNCTION_PARAMETERS(def) \
+DRI_CONF_OPT_BEGIN_B(allow_glsl_layout_qualifier_on_function_parameters, def) \
+        DRI_CONF_DESC("Allow layout qualifiers on function parameters.") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ALLOW_DRAW_OUT_OF_ORDER(def) \
+DRI_CONF_OPT_BEGIN_B(allow_draw_out_of_order, def) \
+        DRI_CONF_DESC("Allow out-of-order draw optimizations. Set when Z fighting doesn't have to be accurate.") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_FORCE_GL_VENDOR(def) \
+DRI_CONF_OPT_BEGIN(force_gl_vendor, string, def) \
+        DRI_CONF_DESC("Allow GPU vendor to be overridden.") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_FORCE_COMPAT_PROFILE(def) \
+DRI_CONF_OPT_BEGIN_B(force_compat_profile, def) \
+        DRI_CONF_DESC("Force an OpenGL compatibility context") \
+DRI_CONF_OPT_END
+
+/**
+ * \brief Image quality-related options
+ */
+#define DRI_CONF_SECTION_QUALITY \
+DRI_CONF_SECTION_BEGIN \
+        DRI_CONF_DESC("Image Quality")
+
+#define DRI_CONF_PRECISE_TRIG(def) \
+DRI_CONF_OPT_BEGIN_B(precise_trig, def) \
+        DRI_CONF_DESC("Prefer accuracy over performance in trig functions") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_PP_CELSHADE(def) \
+DRI_CONF_OPT_BEGIN_V(pp_celshade,enum,def,"0:1") \
+        DRI_CONF_DESC("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("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("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("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("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("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("Performance")
+
+#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("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_OPT_END
+
+#define DRI_CONF_ADAPTIVE_SYNC(def) \
+DRI_CONF_OPT_BEGIN_B(adaptive_sync,def) \
+        DRI_CONF_DESC("Adapt the monitor sync to the application performance (when possible)") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(def) \
+DRI_CONF_OPT_BEGIN_B(vk_wsi_force_bgra8_unorm_first, def) \
+        DRI_CONF_DESC("Force vkGetPhysicalDeviceSurfaceFormatsKHR to return VK_FORMAT_B8G8R8A8_UNORM as the first format") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_VK_X11_OVERRIDE_MIN_IMAGE_COUNT(def) \
+DRI_CONF_OPT_BEGIN_V(vk_x11_override_min_image_count, int, def, "0:999") \
+        DRI_CONF_DESC("Override the VkSurfaceCapabilitiesKHR::minImageCount (0 = no override)") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(def) \
+DRI_CONF_OPT_BEGIN_B(vk_x11_strict_image_count, def) \
+        DRI_CONF_DESC("Force the X11 WSI to create exactly the number of image specified by the application in VkSwapchainCreateInfoKHR::minImageCount") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_MESA_GLTHREAD(def) \
+DRI_CONF_OPT_BEGIN_B(mesa_glthread, def) \
+        DRI_CONF_DESC("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("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("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("Disable the GLX_OML_sync_control extension") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_DISABLE_SGI_VIDEO_SYNC(def) \
+DRI_CONF_OPT_BEGIN_B(glx_disable_sgi_video_sync, def) \
+   DRI_CONF_DESC("Disable the GLX_SGI_video_sync extension") \
+DRI_CONF_OPT_END
+
+
+
+/**
+ * \brief Miscellaneous configuration options
+ */
+#define DRI_CONF_SECTION_MISCELLANEOUS \
+DRI_CONF_SECTION_BEGIN \
+        DRI_CONF_DESC("Miscellaneous")
+
+#define DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER(def) \
+DRI_CONF_OPT_BEGIN_B(always_have_depth_buffer, def) \
+        DRI_CONF_DESC("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("Force uninitialized variables to default to zero") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_VS_POSITION_ALWAYS_INVARIANT(def) \
+DRI_CONF_OPT_BEGIN_B(vs_position_always_invariant, def) \
+        DRI_CONF_DESC("Force the vertex shader's gl_Position output to be considered 'invariant'") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ALLOW_RGB10_CONFIGS(def) \
+DRI_CONF_OPT_BEGIN_B(allow_rgb10_configs, def) \
+DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with rgb10a2 formats") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ALLOW_RGB565_CONFIGS(def) \
+DRI_CONF_OPT_BEGIN_B(allow_rgb565_configs, def) \
+DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with rgb565 formats") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_ALLOW_FP16_CONFIGS(def) \
+DRI_CONF_OPT_BEGIN_B(allow_fp16_configs, def) \
+DRI_CONF_DESC("Allow exposure of visuals and fbconfigs with fp16 formats") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_FORCE_INTEGER_TEX_NEAREST(def) \
+DRI_CONF_OPT_BEGIN_B(force_integer_tex_nearest, def) \
+        DRI_CONF_DESC("Force integer textures to use nearest filtering") \
+DRI_CONF_OPT_END
+
+/**
+ * \brief Initialization configuration options
+ */
+#define DRI_CONF_SECTION_INITIALIZATION \
+DRI_CONF_SECTION_BEGIN \
+        DRI_CONF_DESC("Initialization")
+
+#define DRI_CONF_DEVICE_ID_PATH_TAG(def) \
+DRI_CONF_OPT_BEGIN(device_id, string, def) \
+        DRI_CONF_DESC("Define the graphic device to use if possible") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_DRI_DRIVER(def) \
+DRI_CONF_OPT_BEGIN(dri_driver, string, def) \
+        DRI_CONF_DESC("Override the DRI driver to load") \
+DRI_CONF_OPT_END
+
+/**
+ * \brief Gallium-Nine specific configuration options
+ */
+
+#define DRI_CONF_SECTION_NINE \
+DRI_CONF_SECTION_BEGIN \
+        DRI_CONF_DESC("Gallium Nine")
+
+#define DRI_CONF_NINE_THROTTLE(def) \
+DRI_CONF_OPT_BEGIN(throttle_value, int, def) \
+        DRI_CONF_DESC("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("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("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("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("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("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
+
+#define DRI_CONF_NINE_DYNAMICTEXTUREWORKAROUND(def) \
+DRI_CONF_OPT_BEGIN_B(dynamic_texture_workaround, def) \
+        DRI_CONF_DESC("If set to true, use a ram intermediate buffer for dynamic textures. Increases ram usage, which can cause out of memory issues, but can fix glitches for some games.") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_NINE_SHADERINLINECONSTANTS(def) \
+DRI_CONF_OPT_BEGIN_B(shader_inline_constants, def) \
+        DRI_CONF_DESC("If set to true, recompile shaders with integer or boolean constants when the values are known. Can cause stutter, but can increase slightly performance.") \
+DRI_CONF_OPT_END
+
+/**
+ * \brief radeonsi specific configuration options
+ */
+
+#define DRI_CONF_RADEONSI_ASSUME_NO_Z_FIGHTS(def) \
+DRI_CONF_OPT_BEGIN_B(radeonsi_assume_no_z_fights, def) \
+        DRI_CONF_DESC("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("Commutative additive blending optimizations (may cause rendering errors)") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(def) \
+DRI_CONF_OPT_BEGIN_B(radeonsi_zerovram, def) \
+        DRI_CONF_DESC("Zero all vram allocations") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_V3D_NONMSAA_TEXTURE_SIZE_LIMIT(def) \
+DRI_CONF_OPT_BEGIN_B(v3d_nonmsaa_texture_size_limit, def) \
+        DRI_CONF_DESC("Report the non-MSAA-only texture size limit") \
+DRI_CONF_OPT_END
+
+/**
+ * \brief virgl specific configuration options
+ */
+
+#define DRI_CONF_GLES_EMULATE_BGRA(def) \
+DRI_CONF_OPT_BEGIN_B(gles_emulate_bgra, def) \
+        DRI_CONF_DESC("On GLES emulate BGRA formats by using a swizzled RGBA format") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE(def) \
+DRI_CONF_OPT_BEGIN_B(gles_apply_bgra_dest_swizzle, def) \
+        DRI_CONF_DESC("When the BGRA formats are emulated by using swizzled RGBA formats on GLES apply the swizzle when writing") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_GLES_SAMPLES_PASSED_VALUE(def, minimum, maximum) \
+DRI_CONF_OPT_BEGIN_V(gles_samples_passed_value, def, minimum, maximum) \
+        DRI_CONF_DESC("GL_SAMPLES_PASSED value when emulated by GL_ANY_SAMPLES_PASSED") \
+DRI_CONF_OPT_END
+
+/**
+ * \brief RADV specific configuration options
  */
-#include "xmlpool/options.h"
+
+#define DRI_CONF_RADV_REPORT_LLVM9_VERSION_STRING(def) \
+DRI_CONF_OPT_BEGIN_B(radv_report_llvm9_version_string, def) \
+        DRI_CONF_DESC("Report LLVM 9.0.1 for games that apply shader workarounds if missing (for ACO only)") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_RADV_ENABLE_MRT_OUTPUT_NAN_FIXUP(def) \
+DRI_CONF_OPT_BEGIN_B(radv_enable_mrt_output_nan_fixup, def) \
+        DRI_CONF_DESC("Replace NaN outputs from fragment shaders with zeroes for floating point render target") \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(def) \
+DRI_CONF_OPT_BEGIN_B(radv_no_dynamic_bounds, def) \
+        DRI_CONF_DESC("Disabling bounds checking for dynamic buffer descriptors") \
+DRI_CONF_OPT_END
 
 #endif
diff --git a/src/util/xmlpool/.gitignore b/src/util/xmlpool/.gitignore
deleted file mode 100644
index db5b642826e..00000000000
--- a/src/util/xmlpool/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-xmlpool.pot
diff --git a/src/util/xmlpool/LINGUAS b/src/util/xmlpool/LINGUAS
deleted file mode 100644
index 8b137891791..00000000000
--- a/src/util/xmlpool/LINGUAS
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/util/xmlpool/POTFILES b/src/util/xmlpool/POTFILES
deleted file mode 100644
index d68d7009be4..00000000000
--- a/src/util/xmlpool/POTFILES
+++ /dev/null
@@ -1 +0,0 @@
-src/util/xmlpool/t_options.h
diff --git a/src/util/xmlpool/SConscript b/src/util/xmlpool/SConscript
deleted file mode 100644
index 0a00cefa655..00000000000
--- a/src/util/xmlpool/SConscript
+++ /dev/null
@@ -1,14 +0,0 @@
-Import('*')
-
-from sys import executable as python_cmd
-
-LOCALEDIR = env.Dir('.').srcnode().abspath
-
-xmlpool_options, = env.CodeGenerate(
-    target = 'options.h',
-    script = 'gen_xmlpool.py',
-    source = ['t_options.h'],
-    command = python_cmd + ' $SCRIPT --template $SOURCE --output $TARGET --localedir ' + LOCALEDIR
-)
-
-Export('xmlpool_options')
diff --git a/src/util/xmlpool/gen_xmlpool.py b/src/util/xmlpool/gen_xmlpool.py
deleted file mode 100644
index 3a352312644..00000000000
--- a/src/util/xmlpool/gen_xmlpool.py
+++ /dev/null
@@ -1,216 +0,0 @@
-# encoding=utf-8
-#
-# Usage:
-#     gen_xmlpool.py /path/to/t_option.h localedir lang lang lang ...
-#
-# For each given language, this script expects to find a .mo file at
-# `{localedir}/{language}/LC_MESSAGES/options.mo`.
-#
-
-from __future__ import print_function, unicode_literals
-import argparse
-import gettext
-import io
-import os
-import re
-import sys
-
-if sys.version_info < (3, 0):
-    gettext_method = 'ugettext'
-else:
-    gettext_method = 'gettext'
-
-# Escape special characters in C strings
-def escapeCString(s):
-    escapeSeqs = {'\a' : '\\a', '\b' : '\\b', '\f' : '\\f', '\n' : '\\n',
-                  '\r' : '\\r', '\t' : '\\t', '\v' : '\\v', '\\' : '\\\\'}
-    # " -> '' is a hack. Quotes (") aren't possible in XML attributes.
-    # Better use Unicode characters for typographic quotes in option
-    # descriptions and translations.
-    last_quote = '”'
-    i = 0
-    r = ''
-    for c in s:
-        # Special case: escape double quote with “ or ”, depending
-        # on whether it's an open or close quote. This is needed because plain
-        # double quotes are not possible in XML attributes.
-        if c == '"':
-            if last_quote == '”':
-                q = '“'
-            else:
-                q = '”'
-            last_quote = q
-            r = r + q
-        elif c in escapeSeqs:
-            r = r + escapeSeqs[c]
-        else:
-            r = r + c
-    return r
-
-# Expand escape sequences in C strings (needed for gettext lookup)
-def expandCString(s):
-    escapeSeqs = {'a' : '\a', 'b' : '\b', 'f' : '\f', 'n' : '\n',
-                  'r' : '\r', 't' : '\t', 'v' : '\v',
-                  '"' : '"', '\\' : '\\'}
-    escape = False
-    hexa = False
-    octa = False
-    num = 0
-    digits = 0
-    r = u''
-    for c in s:
-        if not escape:
-            if c == '\\':
-                escape = True
-            else:
-                r = r + c
-        elif hexa:
-            if (c >= '0' and c <= '9') or \
-               (c >= 'a' and c <= 'f') or \
-               (c >= 'A' and c <= 'F'):
-                num = num * 16 + int(c, 16)
-                digits = digits + 1
-            else:
-                digits = 2
-            if digits >= 2:
-                hexa = False
-                escape = False
-                r = r + chr(num)
-        elif octa:
-            if c >= '0' and c <= '7':
-                num = num * 8 + int(c, 8)
-                digits = digits + 1
-            else:
-                digits = 3
-            if digits >= 3:
-                octa = False
-                escape = False
-                r = r + chr(num)
-        else:
-            if c in escapeSeqs:
-                r = r + escapeSeqs[c]
-                escape = False
-            elif c >= '0' and c <= '7':
-                octa = True
-                num = int(c, 8)
-                if num <= 3:
-                    digits = 1
-                else:
-                    digits = 2
-            elif c == 'x' or c == 'X':
-                hexa = True
-                num = 0
-                digits = 0
-            else:
-                r = r + c
-                escape = False
-    return r
-
-# Expand matches. The first match is always a DESC or DESC_BEGIN match.
-# Subsequent matches are ENUM matches.
-#
-# DESC, DESC_BEGIN format: \1 \2=<lang> \3 \4=gettext(" \5=<text> \6=") \7
-# ENUM format:             \1 \2=gettext(" \3=<text> \4=") \5
-def expandMatches(matches, translations, outfile, end=None):
-    assert len(matches) > 0
-    nTranslations = len(translations)
-    i = 0
-    # Expand the description+enums for all translations
-    for lang,trans in translations:
-        i = i + 1
-        # Make sure that all but the last line of a simple description
-        # are extended with a backslash.
-        suffix = ''
-        if len(matches) == 1 and i < len(translations) and \
-               not matches[0].expand(r'\7').endswith('\\'):
-            suffix = ' \\'
-        text = escapeCString(getattr(trans, gettext_method)(expandCString(
-            matches[0].expand (r'\5'))))
-        text = (matches[0].expand(r'\1' + lang + r'\3"' + text + r'"\7') + suffix)
-
-        outfile.write(text + '\n')
-
-        # Expand any subsequent enum lines
-        for match in matches[1:]:
-            text = escapeCString(getattr(trans, gettext_method)(expandCString(
-                match.expand(r'\3'))))
-            text = match.expand(r'\1"' + text + r'"\5')
-
-            outfile.write(text + '\n')
-
-        # Expand description end
-        if end:
-            outfile.write(end)
-
-# Regular expressions:
-reLibintl_h = re.compile(r'#\s*include\s*<libintl.h>')
-reDESC = re.compile(r'(\s*DRI_CONF_DESC\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')
-reDESC_BEGIN = re.compile(r'(\s*DRI_CONF_DESC_BEGIN\s*\(\s*)([a-z]+)(\s*,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')
-reENUM = re.compile(r'(\s*DRI_CONF_ENUM\s*\([^,]+,\s*)(gettext\s*\(\s*")(.*)("\s*\))(\s*\)[ \t]*\\?)$')
-reDESC_END = re.compile(r'\s*DRI_CONF_DESC_END')
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--template', required=True)
-    parser.add_argument('--output', required=True)
-    parser.add_argument('--localedir', required=True)
-    parser.add_argument('--languages', nargs='*', default=[])
-    args = parser.parse_args()
-
-    # Compile a list of translation classes to all supported languages.
-    # The first translation is always a NullTranslations.
-    translations = [("en", gettext.NullTranslations())]
-    for lang in args.languages:
-        try:
-            filename = os.path.join(args.localedir, '{}.gmo'.format(lang))
-            with io.open(filename, 'rb') as f:
-                trans = gettext.GNUTranslations(f)
-        except (IOError, OSError):
-            print("Warning: language '%s' not found." % lang, file=sys.stderr)
-            continue
-        translations.append((lang, trans))
-
-    with io.open(args.output, mode='wt', encoding='utf-8') as output:
-        output.write("/* This is file is generated automatically. Don't edit!  */\n")
-
-        # Process the options template and generate options.h with all
-        # translations.
-        with io.open(args.template, mode="rt", encoding='utf-8') as template:
-            descMatches = []
-            for line in template:
-                if descMatches:
-                    matchENUM = reENUM.match(line)
-                    matchDESC_END = reDESC_END.match(line)
-                    if matchENUM:
-                        descMatches.append(matchENUM)
-                    elif matchDESC_END:
-                        expandMatches(descMatches, translations, output, line)
-                        descMatches = []
-                    else:
-                        print("Warning: unexpected line inside description dropped:\n",
-                              line, file=sys.stderr)
-                    continue
-                if reLibintl_h.search(line):
-                    # Ignore (comment out) #include <libintl.h>
-                    output.write("/* %s * commented out by gen_xmlpool.py */\n" % line)
-                    continue
-                matchDESC = reDESC.match(line)
-                matchDESC_BEGIN = reDESC_BEGIN.match(line)
-                if matchDESC:
-                    assert not descMatches
-                    expandMatches([matchDESC], translations, output)
-                elif matchDESC_BEGIN:
-                    assert not descMatches
-                    descMatches = [matchDESC_BEGIN]
-                else:
-
-                    output.write(line)
-
-        if descMatches:
-            print("Warning: unterminated description at end of file.", file=sys.stderr)
-            expandMatches(descMatches, translations, output)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/util/xmlpool/meson.build b/src/util/xmlpool/meson.build
deleted file mode 100644
index f168d8f4359..00000000000
--- a/src/util/xmlpool/meson.build
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright © 2017 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 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.
-
-_langs = []
-
-_langs_po_files = []
-foreach lang : _langs
-  _langs_po_files += files(lang + '.po')
-endforeach
-
-_xmlpool_options_h = custom_target(
-  'xmlpool_options.h',
-  input : ['gen_xmlpool.py', 't_options.h'],
-  output : 'options.h',
-  command : [
-    prog_python, '@INPUT0@', '--template', '@INPUT1@', '--output', '@OUTPUT@',
-    '--localedir', meson.current_build_dir(), '--languages',  _langs,
-  ],
-  depend_files : _langs_po_files,
-)
-
-idep_xmlconfig_headers = declare_dependency(
-  sources : _xmlpool_options_h,
-  include_directories : inc_util,
-)
-
-if host_machine.system() != 'windows'
-  i18n = import('i18n')
-  i18n.gettext('xmlpool', install : false)
-endif
diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h
deleted file mode 100644
index 8995310865d..00000000000
--- a/src/util/xmlpool/t_options.h
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * 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 options in this file are defined in
- * src/util/xmlpool.h.
- */
-
-/* This is needed for xgettext to extract translatable strings.
- * gen_xmlpool.py will discard this line. */
-#include <libintl.h>
-
-/*
- * 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,gettext("Debugging"))
-
-#define DRI_CONF_ALWAYS_FLUSH_BATCH(def) \
-DRI_CONF_OPT_BEGIN_B(always_flush_batch, def) \
-        DRI_CONF_DESC(en,gettext("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,gettext("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,gettext("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,gettext("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,gettext("Disable dual source blending")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_ARB_GPU_SHADER5(def) \
-DRI_CONF_OPT_BEGIN_B(disable_arb_gpu_shader5, def) \
-        DRI_CONF_DESC(en,"Disable GL_ARB_gpu_shader5") \
-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,gettext("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,gettext("Disable backslash-based line continuations in GLSL source")) \
-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,gettext("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,gettext("Allow GLSL #extension directives in the middle of shaders")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_GLSL_BUILTIN_CONST_EXPRESSION(def) \
-DRI_CONF_OPT_BEGIN_B(allow_glsl_builtin_const_expression, def) \
-        DRI_CONF_DESC(en,gettext("Allow builtins as part of constant expressions")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_GLSL_RELAXED_ES(def) \
-DRI_CONF_OPT_BEGIN_B(allow_glsl_relaxed_es, def) \
-        DRI_CONF_DESC(en,gettext("Allow some relaxation of GLSL ES shader restrictions")) \
-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,gettext("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,gettext("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,gettext("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,gettext("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,gettext("Allow interpolation qualifier mismatch across shader stages")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_GLSL_LAYOUT_QUALIFIER_ON_FUNCTION_PARAMETERS(def) \
-DRI_CONF_OPT_BEGIN_B(allow_glsl_layout_qualifier_on_function_parameters, def) \
-        DRI_CONF_DESC(en,gettext("Allow layout qualifiers on function parameters.")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_DRAW_OUT_OF_ORDER(def) \
-DRI_CONF_OPT_BEGIN_B(allow_draw_out_of_order, def) \
-        DRI_CONF_DESC(en,gettext("Allow out-of-order draw optimizations. Set when Z fighting doesn't have to be accurate.")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FORCE_GL_VENDOR(def) \
-DRI_CONF_OPT_BEGIN(force_gl_vendor, string, def) \
-        DRI_CONF_DESC(en,gettext("Allow GPU vendor to be overridden.")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FORCE_COMPAT_PROFILE(def) \
-DRI_CONF_OPT_BEGIN_B(force_compat_profile, def) \
-        DRI_CONF_DESC(en,gettext("Force an OpenGL compatibility context")) \
-DRI_CONF_OPT_END
-
-/**
- * \brief Image quality-related options
- */
-#define DRI_CONF_SECTION_QUALITY \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,gettext("Image Quality"))
-
-#define DRI_CONF_PRECISE_TRIG(def) \
-DRI_CONF_OPT_BEGIN_B(precise_trig, def) \
-        DRI_CONF_DESC(en,gettext("Prefer accuracy over performance in trig functions")) \
-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,gettext("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,gettext("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,gettext("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,gettext("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,gettext("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,gettext("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,gettext("Performance"))
-
-#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,gettext("Synchronization with vertical refresh (swap intervals)")) \
-                DRI_CONF_ENUM(0,gettext("Never synchronize with vertical refresh, ignore application's choice")) \
-                DRI_CONF_ENUM(1,gettext("Initial swap interval 0, obey application's choice")) \
-                DRI_CONF_ENUM(2,gettext("Initial swap interval 1, obey application's choice")) \
-                DRI_CONF_ENUM(3,gettext("Always synchronize with vertical refresh, application chooses the minimum swap interval")) \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ADAPTIVE_SYNC(def) \
-DRI_CONF_OPT_BEGIN_B(adaptive_sync,def) \
-        DRI_CONF_DESC(en,gettext("Adapt the monitor sync to the application performance (when possible)")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(def) \
-DRI_CONF_OPT_BEGIN_B(vk_wsi_force_bgra8_unorm_first, def) \
-        DRI_CONF_DESC(en,gettext("Force vkGetPhysicalDeviceSurfaceFormatsKHR to return VK_FORMAT_B8G8R8A8_UNORM as the first format")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_VK_X11_OVERRIDE_MIN_IMAGE_COUNT(def) \
-DRI_CONF_OPT_BEGIN_V(vk_x11_override_min_image_count, int, def, "0:999") \
-        DRI_CONF_DESC(en,gettext("Override the VkSurfaceCapabilitiesKHR::minImageCount (0 = no override)")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(def) \
-DRI_CONF_OPT_BEGIN_B(vk_x11_strict_image_count, def) \
-        DRI_CONF_DESC(en,gettext("Force the X11 WSI to create exactly the number of image specified by the application in VkSwapchainCreateInfoKHR::minImageCount")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_MESA_GLTHREAD(def) \
-DRI_CONF_OPT_BEGIN_B(mesa_glthread, def) \
-        DRI_CONF_DESC(en,gettext("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,gettext("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, gettext("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, gettext("Disable the GLX_OML_sync_control extension")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DISABLE_SGI_VIDEO_SYNC(def) \
-DRI_CONF_OPT_BEGIN_B(glx_disable_sgi_video_sync, def) \
-   DRI_CONF_DESC(en, gettext("Disable the GLX_SGI_video_sync extension")) \
-DRI_CONF_OPT_END
-
-
-
-/**
- * \brief Miscellaneous configuration options
- */
-#define DRI_CONF_SECTION_MISCELLANEOUS \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,gettext("Miscellaneous"))
-
-#define DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER(def) \
-DRI_CONF_OPT_BEGIN_B(always_have_depth_buffer, def) \
-        DRI_CONF_DESC(en,gettext("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,gettext("Force uninitialized variables to default to zero")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_VS_POSITION_ALWAYS_INVARIANT(def) \
-DRI_CONF_OPT_BEGIN_B(vs_position_always_invariant, def) \
-        DRI_CONF_DESC(en,gettext("Force the vertex shader's gl_Position output to be considered 'invariant'")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_RGB10_CONFIGS(def) \
-DRI_CONF_OPT_BEGIN_B(allow_rgb10_configs, def) \
-DRI_CONF_DESC(en,gettext("Allow exposure of visuals and fbconfigs with rgb10a2 formats")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_RGB565_CONFIGS(def) \
-DRI_CONF_OPT_BEGIN_B(allow_rgb565_configs, def) \
-DRI_CONF_DESC(en,gettext("Allow exposure of visuals and fbconfigs with rgb565 formats")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_ALLOW_FP16_CONFIGS(def) \
-DRI_CONF_OPT_BEGIN_B(allow_fp16_configs, def) \
-DRI_CONF_DESC(en,gettext("Allow exposure of visuals and fbconfigs with fp16 formats")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FORCE_INTEGER_TEX_NEAREST(def) \
-DRI_CONF_OPT_BEGIN_B(force_integer_tex_nearest, def) \
-        DRI_CONF_DESC(en,gettext("Force integer textures to use nearest filtering")) \
-DRI_CONF_OPT_END
-
-/**
- * \brief Initialization configuration options
- */
-#define DRI_CONF_SECTION_INITIALIZATION \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,gettext("Initialization"))
-
-#define DRI_CONF_DEVICE_ID_PATH_TAG(def) \
-DRI_CONF_OPT_BEGIN(device_id, string, def) \
-        DRI_CONF_DESC(en,gettext("Define the graphic device to use if possible")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DRI_DRIVER(def) \
-DRI_CONF_OPT_BEGIN(dri_driver, string, def) \
-        DRI_CONF_DESC(en,gettext("Override the DRI driver to load")) \
-DRI_CONF_OPT_END
-
-/**
- * \brief Gallium-Nine specific configuration options
- */
-
-#define DRI_CONF_SECTION_NINE \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,gettext("Gallium Nine"))
-
-#define DRI_CONF_NINE_THROTTLE(def) \
-DRI_CONF_OPT_BEGIN(throttle_value, int, def) \
-        DRI_CONF_DESC(en,gettext("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,gettext("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,gettext("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,gettext("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,gettext("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,gettext("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
-
-#define DRI_CONF_NINE_DYNAMICTEXTUREWORKAROUND(def) \
-DRI_CONF_OPT_BEGIN_B(dynamic_texture_workaround, def) \
-        DRI_CONF_DESC(en,gettext("If set to true, use a ram intermediate buffer for dynamic textures. Increases ram usage, which can cause out of memory issues, but can fix glitches for some games.")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_NINE_SHADERINLINECONSTANTS(def) \
-DRI_CONF_OPT_BEGIN_B(shader_inline_constants, def) \
-        DRI_CONF_DESC(en,gettext("If set to true, recompile shaders with integer or boolean constants when the values are known. Can cause stutter, but can increase slightly performance.")) \
-DRI_CONF_OPT_END
-
-/**
- * \brief radeonsi specific configuration options
- */
-
-#define DRI_CONF_RADEONSI_ASSUME_NO_Z_FIGHTS(def) \
-DRI_CONF_OPT_BEGIN_B(radeonsi_assume_no_z_fights, def) \
-        DRI_CONF_DESC(en,gettext("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,gettext("Commutative additive blending optimizations (may cause rendering errors)")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(def) \
-DRI_CONF_OPT_BEGIN_B(radeonsi_zerovram, def) \
-        DRI_CONF_DESC(en,"Zero all vram allocations") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_V3D_NONMSAA_TEXTURE_SIZE_LIMIT(def) \
-DRI_CONF_OPT_BEGIN_B(v3d_nonmsaa_texture_size_limit, def) \
-        DRI_CONF_DESC(en,"Report the non-MSAA-only texture size limit") \
-DRI_CONF_OPT_END
-
-/**
- * \brief virgl specific configuration options
- */
-
-#define DRI_CONF_GLES_EMULATE_BGRA(def) \
-DRI_CONF_OPT_BEGIN_B(gles_emulate_bgra, def) \
-        DRI_CONF_DESC(en,gettext("On GLES emulate BGRA formats by using a swizzled RGBA format")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE(def) \
-DRI_CONF_OPT_BEGIN_B(gles_apply_bgra_dest_swizzle, def) \
-        DRI_CONF_DESC(en,gettext("When the BGRA formats are emulated by using swizzled RGBA formats on GLES apply the swizzle when writing")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_GLES_SAMPLES_PASSED_VALUE(def, minimum, maximum) \
-DRI_CONF_OPT_BEGIN_V(gles_samples_passed_value, def, minimum, maximum) \
-        DRI_CONF_DESC(en,gettext("GL_SAMPLES_PASSED value when emulated by GL_ANY_SAMPLES_PASSED")) \
-DRI_CONF_OPT_END
-
-/**
- * \brief RADV specific configuration options
- */
-
-#define DRI_CONF_RADV_REPORT_LLVM9_VERSION_STRING(def) \
-DRI_CONF_OPT_BEGIN_B(radv_report_llvm9_version_string, def) \
-        DRI_CONF_DESC(en,gettext("Report LLVM 9.0.1 for games that apply shader workarounds if missing (for ACO only)")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_RADV_ENABLE_MRT_OUTPUT_NAN_FIXUP(def) \
-DRI_CONF_OPT_BEGIN_B(radv_enable_mrt_output_nan_fixup, def) \
-        DRI_CONF_DESC(en,gettext("Replace NaN outputs from fragment shaders with zeroes for floating point render target")) \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_RADV_NO_DYNAMIC_BOUNDS(def) \
-DRI_CONF_OPT_BEGIN_B(radv_no_dynamic_bounds, def) \
-        DRI_CONF_DESC(en,gettext("Disabling bounds checking for dynamic buffer descriptors")) \
-DRI_CONF_OPT_END