mesa: move legacy dri config option texture_units

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 468cbd53595c6d6fae4fb67f595f78a040c94fe4..009d7953a24d965733f782164cff7e4f6a137530 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -70,6 +70,11 @@ DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \
         DRI_CONF_DESC(de,"Grösse des Befehlspuffers (in KB)") \
 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_OPT_END
+
 #if defined(RADEON_R100)       /* R100 */
 static const __DRIconfigOptionsExtension radeon_config_options = {
    .base = { __DRI_CONFIG_OPTIONS, 1 },

diff --git a/src/util/xmlpool/ca.po b/src/util/xmlpool/ca.po
index 6ee9e3fd5bf58c063fb4266d0ef8794f71244553..55d83f903fb00c8b8366328b154b90048400aaf1 100644 (file)
--- a/src/util/xmlpool/ca.po
+++ b/src/util/xmlpool/ca.po
@@ -270,10 +270,6 @@ msgstr ""
 msgid "Use HyperZ to boost performance"
 msgstr "Utilitza el HyperZ per a augmentar el rendiment"
 
-#: t_options.h:281
-msgid "Number of texture units used"
-msgstr "Nombre d'unitats de textura utilitzades"
-
 #: t_options.h:323
 msgid "Miscellaneous"
 msgstr "Miscel·lània"

diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po
index 050f228ac58230f6af7946163568a28b90d968c7..5490940f5eef63f27c36e47b8858958b5105cf4f 100644 (file)
--- a/src/util/xmlpool/de.po
+++ b/src/util/xmlpool/de.po
@@ -245,10 +245,6 @@ msgstr ""
 msgid "Use HyperZ to boost performance"
 msgstr "HyperZ zur Leistungssteigerung verwenden"
 
-#: t_options.h:281
-msgid "Number of texture units used"
-msgstr "Anzahl der benutzten Textureinheiten"
-
 #: t_options.h:323
 msgid "Miscellaneous"
 msgstr ""

diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po
index cc88f6848c438187691d8098289e05452a621791..7c9986cf4f0085d3d7bffe3cd786660087e6cdbe 100644 (file)
--- a/src/util/xmlpool/es.po
+++ b/src/util/xmlpool/es.po
@@ -254,10 +254,6 @@ msgstr ""
 msgid "Use HyperZ to boost performance"
 msgstr "Usar HyperZ para potenciar rendimiento"
 
-#: t_options.h:281
-msgid "Number of texture units used"
-msgstr "Número de unidades de textura usadas"
-
 #: t_options.h:323
 msgid "Miscellaneous"
 msgstr "Misceláneos"

diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po
index e768051160ab34b2a47c39e910637325698286bb..44c2990e89765a3ec294cf6299003df2d2029a07 100644 (file)
--- a/src/util/xmlpool/fr.po
+++ b/src/util/xmlpool/fr.po
@@ -243,10 +243,6 @@ msgstr ""
 msgid "Use HyperZ to boost performance"
 msgstr "Utiliser le HyperZ pour améliorer les performances"
 
-#: t_options.h:281
-msgid "Number of texture units used"
-msgstr "Nombre d'unités de texture"
-
 #: t_options.h:323
 msgid "Miscellaneous"
 msgstr ""

diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po
index 1898a681fb766915d8e5be438faf9af8f52b0164..e24afb2c53648d575c28d8ca13626336d00b7353 100644 (file)
--- a/src/util/xmlpool/nl.po
+++ b/src/util/xmlpool/nl.po
@@ -242,10 +242,6 @@ msgstr ""
 msgid "Use HyperZ to boost performance"
 msgstr "Gebruik HyperZ om de prestaties te verbeteren"
 
-#: t_options.h:281
-msgid "Number of texture units used"
-msgstr "Aantal textuureenheden in gebruik"
-
 #: t_options.h:323
 msgid "Miscellaneous"
 msgstr ""

diff --git a/src/util/xmlpool/sv.po b/src/util/xmlpool/sv.po
index f2adb61de9d257cd8afc1aa3dcbfba16799a4c47..4e1632442ac26fa6773bee1bf4b7431b351de467 100644 (file)
--- a/src/util/xmlpool/sv.po
+++ b/src/util/xmlpool/sv.po
@@ -236,10 +236,6 @@ msgstr ""
 msgid "Use HyperZ to boost performance"
 msgstr "Använd HyperZ för att maximera prestandan"
 
-#: t_options.h:281
-msgid "Number of texture units used"
-msgstr "Antal använda texturenheter"
-
 #: t_options.h:323
 msgid "Miscellaneous"
 msgstr ""

diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h
index b671e40fa52848543e0e37cca9488686b414cadb..ffcf6f85d3951a19afbc3505914add00f356bff0 100644 (file)
--- a/src/util/xmlpool/t_options.h
+++ b/src/util/xmlpool/t_options.h
@@ -304,11 +304,6 @@ DRI_CONF_OPT_BEGIN_B(hyperz, def) \
         DRI_CONF_DESC(en,gettext("Use HyperZ to boost performance")) \
 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,gettext("Number of texture units used")) \
-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")) \