From f958ea6eff928cf1faacfd11e966b9389746deb5 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 30 Aug 2018 10:19:07 +1000 Subject: [PATCH] mesa: move legacy dri config option fthrottle_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 | 17 ----------------- src/util/xmlpool/de.po | 17 ----------------- src/util/xmlpool/es.po | 17 ----------------- src/util/xmlpool/fr.po | 16 ---------------- src/util/xmlpool/nl.po | 19 ------------------- src/util/xmlpool/sv.po | 16 ---------------- src/util/xmlpool/t_options.h | 12 ------------ 8 files changed, 12 insertions(+), 114 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h index e36e438e295..30202aec8b0 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.h +++ b/src/mesa/drivers/dri/radeon/radeon_screen.h @@ -79,6 +79,18 @@ DRI_CONF_OPT_BEGIN_V(round_mode,enum,def,"0:1") \ DRI_CONF_DESC_END \ DRI_CONF_OPT_END +#define DRI_CONF_FTHROTTLE_BUSY 0 +#define DRI_CONF_FTHROTTLE_USLEEPS 1 +#define DRI_CONF_FTHROTTLE_IRQS 2 +#define DRI_CONF_FTHROTTLE_MODE(def) \ +DRI_CONF_OPT_BEGIN_V(fthrottle_mode,enum,def,"0:2") \ + DRI_CONF_DESC_BEGIN(en,"Method to limit rendering latency") \ + DRI_CONF_ENUM(0,"Busy waiting for the graphics hardware") \ + DRI_CONF_ENUM(1,"Sleep for brief intervals while waiting for the graphics hardware") \ + DRI_CONF_ENUM(2,"Let the graphics hardware emit a software interrupt and sleep") \ + 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 e8ff8af1bb4..ddb37b6dd8f 100644 --- a/src/util/xmlpool/ca.po +++ b/src/util/xmlpool/ca.po @@ -139,23 +139,6 @@ msgstr "" msgid "Performance" msgstr "Rendiment" -#: t_options.h:251 -msgid "Method to limit rendering latency" -msgstr "Mètode per a limitar la latència de renderització" - -#: t_options.h:252 -msgid "Busy waiting for the graphics hardware" -msgstr "Espera activa pel maquinari de gràfics" - -#: t_options.h:253 -msgid "Sleep for brief intervals while waiting for the graphics hardware" -msgstr "Dorm per intervals breus mentre s'espera al maquinari de gràfics" - -#: t_options.h:254 -msgid "Let the graphics hardware emit a software interrupt and sleep" -msgstr "" -"Deixa que el maquinari de gràfics emeti una interrupció de programari i dormi" - #: t_options.h:264 msgid "Synchronization with vertical refresh (swap intervals)" msgstr "Sincronització amb refresc vertical (intervals d'intercanvi)" diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po index 8d5804f4433..7b5b9510cfc 100644 --- a/src/util/xmlpool/de.po +++ b/src/util/xmlpool/de.po @@ -115,23 +115,6 @@ msgstr "" msgid "Performance" msgstr "Leistung" -#: t_options.h:251 -msgid "Method to limit rendering latency" -msgstr "Methode zur Begrenzung der Bildverzögerung" - -#: t_options.h:252 -msgid "Busy waiting for the graphics hardware" -msgstr "Aktives Warten auf die Grafikhardware" - -#: t_options.h:253 -msgid "Sleep for brief intervals while waiting for the graphics hardware" -msgstr "Kurze Schlafintervalle beim Warten auf die Grafikhardware" - -#: t_options.h:254 -msgid "Let the graphics hardware emit a software interrupt and sleep" -msgstr "" -"Die Grafikhardware eine Softwareunterbrechnung erzeugen lassen und schlafen" - #: t_options.h:264 msgid "Synchronization with vertical refresh (swap intervals)" msgstr "Synchronisation mit der vertikalen Bildwiederholung" diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po index c79191f6c8b..81106ae7139 100644 --- a/src/util/xmlpool/es.po +++ b/src/util/xmlpool/es.po @@ -122,23 +122,6 @@ msgstr "" msgid "Performance" msgstr "Rendimiento" -#: t_options.h:251 -msgid "Method to limit rendering latency" -msgstr "Método para limitar la latencia de renderización" - -#: t_options.h:252 -msgid "Busy waiting for the graphics hardware" -msgstr "Esperar activamente al hardware gráfico" - -#: t_options.h:253 -msgid "Sleep for brief intervals while waiting for the graphics hardware" -msgstr "Dormir en intervalos cortos mientras se espera al hardware gráfico" - -#: t_options.h:254 -msgid "Let the graphics hardware emit a software interrupt and sleep" -msgstr "" -"Permitir que el hardware gráfico emita una interrupción de software y duerma" - #: t_options.h:264 msgid "Synchronization with vertical refresh (swap intervals)" msgstr "Sincronización con el refresco vertical (intervalos de intercambio)" diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po index c1856aa0fd3..f1a2ce0748e 100644 --- a/src/util/xmlpool/fr.po +++ b/src/util/xmlpool/fr.po @@ -110,22 +110,6 @@ msgstr "" msgid "Performance" msgstr "Performance" -#: t_options.h:251 -msgid "Method to limit rendering latency" -msgstr "Méthode d'attente de la carte graphique" - -#: t_options.h:252 -msgid "Busy waiting for the graphics hardware" -msgstr "Attente active de la carte graphique" - -#: t_options.h:253 -msgid "Sleep for brief intervals while waiting for the graphics hardware" -msgstr "Attente utilisant usleep()" - -#: t_options.h:254 -msgid "Let the graphics hardware emit a software interrupt and sleep" -msgstr "Utiliser les interruptions" - #: t_options.h:264 msgid "Synchronization with vertical refresh (swap intervals)" msgstr "Synchronisation de l'affichage avec le balayage vertical" diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po index 502222fb346..183d38ed468 100644 --- a/src/util/xmlpool/nl.po +++ b/src/util/xmlpool/nl.po @@ -122,25 +122,6 @@ msgstr "" msgid "Performance" msgstr "Prestatie" -#: t_options.h:251 -msgid "Method to limit rendering latency" -msgstr "Methode om beeldopbouwvertraging te onderdrukken" - -#: t_options.h:252 -msgid "Busy waiting for the graphics hardware" -msgstr "Actief wachten voor de grafische hardware" - -#: t_options.h:253 -msgid "Sleep for brief intervals while waiting for the graphics hardware" -msgstr "" -"Slaap voor korte intervallen tijdens het wachten op de grafische hardware" - -#: t_options.h:254 -msgid "Let the graphics hardware emit a software interrupt and sleep" -msgstr "" -"Laat de grafische hardware een software onderbreking uitzenden en in slaap " -"vallen" - #: t_options.h:264 msgid "Synchronization with vertical refresh (swap intervals)" msgstr "Synchronisatie met verticale verversing (interval omwisselen)" diff --git a/src/util/xmlpool/sv.po b/src/util/xmlpool/sv.po index 3e11072ea89..bb3c120d098 100644 --- a/src/util/xmlpool/sv.po +++ b/src/util/xmlpool/sv.po @@ -126,22 +126,6 @@ msgstr "" msgid "Performance" msgstr "Prestanda" -#: t_options.h:251 -msgid "Method to limit rendering latency" -msgstr "Metod för att begränsa renderingslatens" - -#: t_options.h:252 -msgid "Busy waiting for the graphics hardware" -msgstr "Upptagen med att vänta på grafikhårdvaran" - -#: t_options.h:253 -msgid "Sleep for brief intervals while waiting for the graphics hardware" -msgstr "Sov i korta intervall under väntan på grafikhårdvaran" - -#: t_options.h:254 -msgid "Let the graphics hardware emit a software interrupt and sleep" -msgstr "Låt grafikhårdvaran sända ut ett programvaruavbrott och sov" - #: t_options.h:264 msgid "Synchronization with vertical refresh (swap intervals)" msgstr "Synkronisering med vertikal uppdatering (växlingsintervall)" diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h index 6795e1a6d5c..2acbb34c175 100644 --- a/src/util/xmlpool/t_options.h +++ b/src/util/xmlpool/t_options.h @@ -210,18 +210,6 @@ DRI_CONF_OPT_END DRI_CONF_SECTION_BEGIN \ DRI_CONF_DESC(en,gettext("Performance")) -#define DRI_CONF_FTHROTTLE_BUSY 0 -#define DRI_CONF_FTHROTTLE_USLEEPS 1 -#define DRI_CONF_FTHROTTLE_IRQS 2 -#define DRI_CONF_FTHROTTLE_MODE(def) \ -DRI_CONF_OPT_BEGIN_V(fthrottle_mode,enum,def,"0:2") \ - DRI_CONF_DESC_BEGIN(en,gettext("Method to limit rendering latency")) \ - DRI_CONF_ENUM(0,gettext("Busy waiting for the graphics hardware")) \ - DRI_CONF_ENUM(1,gettext("Sleep for brief intervals while waiting for the graphics hardware")) \ - DRI_CONF_ENUM(2,gettext("Let the graphics hardware emit a software interrupt and sleep")) \ - DRI_CONF_DESC_END \ -DRI_CONF_OPT_END - #define DRI_CONF_VBLANK_NEVER 0 #define DRI_CONF_VBLANK_DEF_INTERVAL_0 1 #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 -- 2.30.2