From 2d7dc9591dfe8f9b40317e646ca978226d2c9b05 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 30 Aug 2018 10:19:01 +1000 Subject: [PATCH] mesa: move legacy dri config option color_reduction MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/mesa/drivers/dri/radeon/radeon_screen.h | 10 ++++++++++ src/util/xmlpool/ca.po | 12 ------------ src/util/xmlpool/de.po | 12 ------------ src/util/xmlpool/es.po | 12 ------------ src/util/xmlpool/fr.po | 12 ------------ src/util/xmlpool/nl.po | 12 ------------ src/util/xmlpool/sv.po | 12 ------------ src/util/xmlpool/t_options.h | 10 ---------- 8 files changed, 10 insertions(+), 82 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h index 9d69dcd4785..35a20996f82 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.h +++ b/src/mesa/drivers/dri/radeon/radeon_screen.h @@ -47,6 +47,16 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_reg.h" #include "util/xmlconfig.h" +#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_OPT_END + #define DRI_CONF_TCL_SW 0 #define DRI_CONF_TCL_PIPELINED 1 diff --git a/src/util/xmlpool/ca.po b/src/util/xmlpool/ca.po index 15c5fa0f133..cab901ae194 100644 --- a/src/util/xmlpool/ca.po +++ b/src/util/xmlpool/ca.po @@ -112,18 +112,6 @@ msgstr "" "Prohibeix una parcialitat negativa del Nivell de Detalle (LOD) de les " "textures" -#: t_options.h:160 -msgid "Initial color reduction method" -msgstr "Mètode inicial de reducció de color" - -#: t_options.h:161 -msgid "Round colors" -msgstr "Colors arrodonits" - -#: t_options.h:162 -msgid "Dither colors" -msgstr "Colors tramats" - #: t_options.h:170 msgid "Color rounding method" msgstr "Mètode d'arrodoniment de color" diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po index 683d33d4bc6..421078441db 100644 --- a/src/util/xmlpool/de.po +++ b/src/util/xmlpool/de.po @@ -87,18 +87,6 @@ msgstr "Initialer Maximalwert für anisotropische Texturfilterung" msgid "Forbid negative texture LOD bias" msgstr "Verbiete negative Textur-Detailgradverschiebung" -#: t_options.h:160 -msgid "Initial color reduction method" -msgstr "Initiale Farbreduktionsmethode" - -#: t_options.h:161 -msgid "Round colors" -msgstr "Farben runden" - -#: t_options.h:162 -msgid "Dither colors" -msgstr "Farben rastern" - #: t_options.h:170 msgid "Color rounding method" msgstr "Farbrundungsmethode" diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po index 8b841c682fe..fe9bce1bbba 100644 --- a/src/util/xmlpool/es.po +++ b/src/util/xmlpool/es.po @@ -94,18 +94,6 @@ msgstr "Valor máximo inicial para filtrado anisotrópico de textura" msgid "Forbid negative texture LOD bias" msgstr "Prohibir valores negativos de Nivel De Detalle (LOD) de texturas" -#: t_options.h:160 -msgid "Initial color reduction method" -msgstr "Método inicial de reducción de color" - -#: t_options.h:161 -msgid "Round colors" -msgstr "Colores redondeados" - -#: t_options.h:162 -msgid "Dither colors" -msgstr "Colores suavizados" - #: t_options.h:170 msgid "Color rounding method" msgstr "Método de redondeo de colores" diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po index d8bab1a2139..609c6041e34 100644 --- a/src/util/xmlpool/fr.po +++ b/src/util/xmlpool/fr.po @@ -86,18 +86,6 @@ msgstr "Valeur maximale initiale pour le filtrage anisotropique de texture" msgid "Forbid negative texture LOD bias" msgstr "Interdire le LOD bias negatif" -#: t_options.h:160 -msgid "Initial color reduction method" -msgstr "Technique de réduction de couleurs" - -#: t_options.h:161 -msgid "Round colors" -msgstr "Arrondir les valeurs de couleur" - -#: t_options.h:162 -msgid "Dither colors" -msgstr "Tramer les couleurs" - #: t_options.h:170 msgid "Color rounding method" msgstr "Méthode d'arrondi des couleurs" diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po index e6fb5d1f9d7..65071e57451 100644 --- a/src/util/xmlpool/nl.po +++ b/src/util/xmlpool/nl.po @@ -86,18 +86,6 @@ msgstr "Initïele maximum waarde voor anisotrophische textuur filtering" msgid "Forbid negative texture LOD bias" msgstr "Verbied negatief niveau detailonderscheid (LOD) van texturen" -#: t_options.h:160 -msgid "Initial color reduction method" -msgstr "Initïele kleurreductie methode" - -#: t_options.h:161 -msgid "Round colors" -msgstr "Rond kleuren af" - -#: t_options.h:162 -msgid "Dither colors" -msgstr "Rasteriseer kleuren" - #: t_options.h:170 msgid "Color rounding method" msgstr "Kleurafrondingmethode" diff --git a/src/util/xmlpool/sv.po b/src/util/xmlpool/sv.po index 89072e66f22..d952d5d8388 100644 --- a/src/util/xmlpool/sv.po +++ b/src/util/xmlpool/sv.po @@ -86,18 +86,6 @@ msgstr "Initialt maximalt värde för anisotropisk texturfiltrering" msgid "Forbid negative texture LOD bias" msgstr "Förbjud negativ LOD-kompensation för texturer" -#: t_options.h:160 -msgid "Initial color reduction method" -msgstr "Initial färgminskningsmetod" - -#: t_options.h:161 -msgid "Round colors" -msgstr "Avrunda färger" - -#: t_options.h:162 -msgid "Dither colors" -msgstr "Utjämna färger" - #: t_options.h:170 msgid "Color rounding method" msgstr "Färgavrundningsmetod" diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h index 8de806c4c8f..bbfccece754 100644 --- a/src/util/xmlpool/t_options.h +++ b/src/util/xmlpool/t_options.h @@ -181,16 +181,6 @@ 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_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,gettext("Initial color reduction method")) \ - DRI_CONF_ENUM(0,gettext("Round colors")) \ - DRI_CONF_ENUM(1,gettext("Dither colors")) \ - 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) \ -- 2.30.2