driconf: drop now unused translation facility

Signed-off-by: Eric Engestrom <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5440>

11 files changed, 10 insertions, 12 deletions

diff --git a/src/gallium/auxiliary/pipe-loader/SConscript b/src/gallium/auxiliary/pipe-loader/SConscript
index 0f72195b29a..14e1b350aea 100644
--- a/src/gallium/auxiliary/pipe-loader/SConscript
+++ b/src/gallium/auxiliary/pipe-loader/SConscript
@@ -7,7 +7,6 @@ env.MSVC2013Compat()
 env.Append(CPPPATH = [
     '#/src/loader',
     '#/src/gallium/winsys',
-    xmlpool_options.dir.dir,
 ])
 
 env.Append(CPPDEFINES = [
diff --git a/src/gallium/auxiliary/postprocess/ADDING b/src/gallium/auxiliary/postprocess/ADDING
index c7c6084dc8b..39f2eda0022 100644
--- a/src/gallium/auxiliary/postprocess/ADDING
+++ b/src/gallium/auxiliary/postprocess/ADDING
@@ -61,8 +61,8 @@ main function as is.
 ---------------------------
 
 First time outside of auxiliary/postprocess. First, add a suitable description to
-drivers/dri/common/xmlpool/t_options.h, and regenerate options.h by running make in that
-directory. Use the name you put into filters.h as the config option name.
+src/util/xmlpool.h.
+Use the name you put into filters.h as the config option name.
 
 With driconf aware of the option, make Gallium aware of it too. Add it to
 frontends/dri/common/dri_screen.c in a proper section, specifying its default value and
diff --git a/src/gallium/drivers/iris/driinfo_iris.h b/src/gallium/drivers/iris/driinfo_iris.h
index a85a806b4f7..b1153bc8313 100644
--- a/src/gallium/drivers/iris/driinfo_iris.h
+++ b/src/gallium/drivers/iris/driinfo_iris.h
@@ -10,7 +10,7 @@ DRI_CONF_SECTION_PERFORMANCE
 
 //= BEGIN VERBATIM
    DRI_CONF_OPT_BEGIN_V(bo_reuse, enum, 1, "0:1")
-      DRI_CONF_DESC(en, "Buffer object reuse")
+      DRI_CONF_DESC("Buffer object reuse")
    DRI_CONF_OPT_END
 //= END VERBATIM
 
diff --git a/src/gallium/drivers/radeonsi/driinfo_radeonsi.h b/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
index 1570f286053..25d1d35f6a9 100644
--- a/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
+++ b/src/gallium/drivers/radeonsi/driinfo_radeonsi.h
@@ -11,7 +11,7 @@ DRI_CONF_SECTION_DEBUG
 //= BEGIN VERBATIM
 #define OPT_BOOL(name, dflt, description)                                                          \
    DRI_CONF_OPT_BEGIN_B(radeonsi_##name, #dflt)                                                    \
-   DRI_CONF_DESC(en, description)                                                                  \
+   DRI_CONF_DESC(description)                                                                  \
    DRI_CONF_OPT_END
 
 #include "radeonsi/si_debug_options.h"
diff --git a/src/gallium/drivers/virgl/virgl_driinfo.h.in b/src/gallium/drivers/virgl/virgl_driinfo.h.in
index cbb0bc5a77b..8119d77a18d 100644
--- a/src/gallium/drivers/virgl/virgl_driinfo.h.in
+++ b/src/gallium/drivers/virgl/virgl_driinfo.h.in
@@ -1,6 +1,6 @@
 // DriConf options specific to virgl
 // To add a new tweak:
-//   1. Define the tweak in util/xmlpool/t_options.h and also add
+//   1. Define the tweak in util/xmlpool.h and also add
 //      the tweak name as define to virgl_protocol.h
 //   2. Add the tweak here with the appropriated default value
 //   3. Add the code to query the tweak in virgl_create_screen
diff --git a/src/gallium/frontends/dri/SConscript b/src/gallium/frontends/dri/SConscript
index fa48fb8a0d7..03c9f71987d 100644
--- a/src/gallium/frontends/dri/SConscript
+++ b/src/gallium/frontends/dri/SConscript
@@ -12,7 +12,6 @@ env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/mesa',
     '#/src/mesa/drivers/dri/common',
-    xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
 ])
 
 sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES')
diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build
index 3585ee652b2..af871c8e6d5 100644
--- a/src/gallium/targets/omx/meson.build
+++ b/src/gallium/targets/omx/meson.build
@@ -44,7 +44,7 @@ libomx_gallium = shared_library(
     libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
   ],
   link_depends : omx_link_depends,
-  dependencies : [idep_mesautil, idep_xmlconfig_headers, driver_r600, driver_radeonsi, driver_nouveau],
+  dependencies : [idep_mesautil, driver_r600, driver_radeonsi, driver_nouveau],
   install : true,
   install_dir : omx_drivers_path,
 )
diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
index 8918ef60130..8cbddc3dcd4 100644
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@@ -46,7 +46,7 @@ libva_gallium = shared_library(
   ],
   dependencies : [
     dep_libdrm, driver_r600, driver_radeonsi, driver_nouveau,
-    idep_mesautil, idep_xmlconfig_headers,
+    idep_mesautil,
   ],
   link_depends : va_link_depends,
   # Will be deleted during installation, see install_megadrivers.py
diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
index 82c6b6d2287..6c726a28f9c 100644
--- a/src/gallium/targets/vdpau/meson.build
+++ b/src/gallium/targets/vdpau/meson.build
@@ -50,7 +50,7 @@ libvdpau_gallium = shared_library(
     libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
   ],
   dependencies : [
-    idep_mesautil, idep_xmlconfig_headers,
+    idep_mesautil,
     driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
   ],
   link_depends : vdpau_link_depends,
diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
index 1f45bcbb856..61084469998 100644
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@@ -47,7 +47,7 @@ libxatracker = shared_library(
   ],
   link_depends : xa_link_depends,
   dependencies : [
-    idep_mesautil, idep_xmlconfig_headers,
+    idep_mesautil,
     driver_nouveau, driver_i915, driver_svga, driver_freedreno,
   ],
   version : _xa_version,
diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
index 11a098af6ac..6ae5a4f7282 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -44,7 +44,7 @@ libxvmc_gallium = shared_library(
     libgalliumvlwinsys, libgalliumvl, libgallium,
     libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
   ],
-  dependencies : [idep_mesautil, idep_xmlconfig_headers, driver_r600, driver_nouveau],
+  dependencies : [idep_mesautil, driver_r600, driver_nouveau],
   link_depends : xvmc_link_depends,
   # Will be deleted during installation, see install_megadrivers.py
   install : true,