From 91e76ce4933704df4a92750105659f10e19a6600 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 30 Aug 2018 10:19:02 +1000 Subject: [PATCH] mesa: move legacy dri config option dither_mode 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 | 12 ++++++++++++ src/util/xmlpool/ca.po | 16 ---------------- src/util/xmlpool/de.po | 16 ---------------- src/util/xmlpool/es.po | 16 ---------------- src/util/xmlpool/fr.po | 16 ---------------- src/util/xmlpool/nl.po | 16 ---------------- src/util/xmlpool/t_options.h | 12 ------------ 7 files changed, 12 insertions(+), 92 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h index 35a20996f82..c5b8023d9d1 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.h +++ b/src/mesa/drivers/dri/radeon/radeon_screen.h @@ -57,6 +57,18 @@ DRI_CONF_OPT_BEGIN_V(color_reduction,enum,def,"0:1") \ 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_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 cab901ae194..5f78915b544 100644 --- a/src/util/xmlpool/ca.po +++ b/src/util/xmlpool/ca.po @@ -124,22 +124,6 @@ msgstr "Arrodoneix els components de color a baix" msgid "Round to nearest color" msgstr "Arrodoneix al color més proper" -#: t_options.h:181 -msgid "Color dithering method" -msgstr "Mètode de tramat de color" - -#: t_options.h:182 -msgid "Horizontal error diffusion" -msgstr "Difusió d'error horitzontal" - -#: t_options.h:183 -msgid "Horizontal error diffusion, reset error at line start" -msgstr "Difusió d'error horitzontal, reinicia l'error a l'inici de la línia" - -#: t_options.h:184 -msgid "Ordered 2D color dithering" -msgstr "Tramat de color 2D ordenat" - #: t_options.h:190 msgid "Floating point depth buffer" msgstr "Buffer de profunditat de punt flotant" diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po index 421078441db..2ef0607cbb2 100644 --- a/src/util/xmlpool/de.po +++ b/src/util/xmlpool/de.po @@ -99,22 +99,6 @@ msgstr "Farbkomponenten abrunden" msgid "Round to nearest color" msgstr "Zur ähnlichsten Farbe runden" -#: t_options.h:181 -msgid "Color dithering method" -msgstr "Farbrasterungsmethode" - -#: t_options.h:182 -msgid "Horizontal error diffusion" -msgstr "Horizontale Fehlerstreuung" - -#: t_options.h:183 -msgid "Horizontal error diffusion, reset error at line start" -msgstr "Horizontale Fehlerstreuung, Fehler am Zeilenanfang zurücksetzen" - -#: t_options.h:184 -msgid "Ordered 2D color dithering" -msgstr "Geordnete 2D Farbrasterung" - #: t_options.h:190 msgid "Floating point depth buffer" msgstr "Fließkomma z-Puffer" diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po index fe9bce1bbba..cfb6c0eb18d 100644 --- a/src/util/xmlpool/es.po +++ b/src/util/xmlpool/es.po @@ -106,22 +106,6 @@ msgstr "Redondear hacia abajo los componentes de color" msgid "Round to nearest color" msgstr "Redondear al color más cercano" -#: t_options.h:181 -msgid "Color dithering method" -msgstr "Método de suavizado de color" - -#: t_options.h:182 -msgid "Horizontal error diffusion" -msgstr "Difusión de error horizontal" - -#: t_options.h:183 -msgid "Horizontal error diffusion, reset error at line start" -msgstr "Difusión de error horizontal, reiniciar error al comienzo de línea" - -#: t_options.h:184 -msgid "Ordered 2D color dithering" -msgstr "Suavizado de color 2D ordenado" - #: t_options.h:190 msgid "Floating point depth buffer" msgstr "Búfer de profundidad en coma flotante" diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po index 609c6041e34..94a248069a0 100644 --- a/src/util/xmlpool/fr.po +++ b/src/util/xmlpool/fr.po @@ -98,22 +98,6 @@ msgstr "Arrondi à l'inférieur" msgid "Round to nearest color" msgstr "Arrondi au plus proche" -#: t_options.h:181 -msgid "Color dithering method" -msgstr "Méthode de tramage" - -#: t_options.h:182 -msgid "Horizontal error diffusion" -msgstr "Diffusion d'erreur horizontale" - -#: t_options.h:183 -msgid "Horizontal error diffusion, reset error at line start" -msgstr "Diffusion d'erreur horizontale, réinitialisé pour chaque ligne" - -#: t_options.h:184 -msgid "Ordered 2D color dithering" -msgstr "Tramage ordonné des couleurs" - #: t_options.h:190 msgid "Floating point depth buffer" msgstr "Z-buffer en virgule flottante" diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po index 65071e57451..9beafb42224 100644 --- a/src/util/xmlpool/nl.po +++ b/src/util/xmlpool/nl.po @@ -86,22 +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:170 -msgid "Color rounding method" -msgstr "Kleurafrondingmethode" - -#: t_options.h:171 -msgid "Round color components downward" -msgstr "Rond kleurencomponenten af naar beneden" - -#: t_options.h:172 -msgid "Round to nearest color" -msgstr "Rond af naar dichtsbijzijnde kleur" - -#: t_options.h:181 -msgid "Color dithering method" -msgstr "Kleurrasteriseringsmethode" - #: t_options.h:182 msgid "Horizontal error diffusion" msgstr "Horizontale foutdiffusie" diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h index bbfccece754..d671849a10c 100644 --- a/src/util/xmlpool/t_options.h +++ b/src/util/xmlpool/t_options.h @@ -191,18 +191,6 @@ DRI_CONF_OPT_BEGIN_V(round_mode,enum,def,"0:1") \ 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,gettext("Color dithering method")) \ - DRI_CONF_ENUM(0,gettext("Horizontal error diffusion")) \ - DRI_CONF_ENUM(1,gettext("Horizontal error diffusion, reset error at line start")) \ - DRI_CONF_ENUM(2,gettext("Ordered 2D color dithering")) \ - 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,gettext("Floating point depth buffer")) \ -- 2.30.2