From: Timothy Arceri Date: Thu, 30 Aug 2018 00:19:00 +0000 (+1000) Subject: mesa: move legacy TCL dri config options X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=408d41a413d79ca93e165ff61640c393f8c4028b;p=mesa.git mesa: move legacy TCL dri config options Reviewed-by: Marek Olšák --- diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 4c93404607d..fe484abf73f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -80,6 +80,16 @@ DRI_CONF_OPT_BEGIN_B(hyperz, def) \ DRI_CONF_DESC(en,"Use HyperZ to boost performance") \ DRI_CONF_OPT_END +#define DRI_CONF_TCL_MODE(def) \ +DRI_CONF_OPT_BEGIN_V(tcl_mode,enum,def,"0:3") \ + DRI_CONF_DESC_BEGIN(en,"TCL mode (Transformation, Clipping, Lighting)") \ + DRI_CONF_ENUM(0,"Use software TCL pipeline") \ + DRI_CONF_ENUM(1,"Use hardware TCL as first TCL pipeline stage") \ + DRI_CONF_ENUM(2,"Bypass the TCL pipeline") \ + DRI_CONF_ENUM(3,"Bypass the TCL pipeline with state-based machine code generated on-the-fly") \ + DRI_CONF_DESC_END \ +DRI_CONF_OPT_END + #if defined(RADEON_R100) /* R100 */ static const __DRIconfigOptionsExtension radeon_config_options = { .base = { __DRI_CONFIG_OPTIONS, 1 }, diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h index efb2e6016b7..9d69dcd4785 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.h +++ b/src/mesa/drivers/dri/radeon/radeon_screen.h @@ -48,6 +48,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "util/xmlconfig.h" +#define DRI_CONF_TCL_SW 0 +#define DRI_CONF_TCL_PIPELINED 1 +#define DRI_CONF_TCL_VTXFMT 2 +#define DRI_CONF_TCL_CODEGEN 3 + typedef struct { drm_handle_t handle; /* Handle to the DRM region */ drmSize size; /* Size of the DRM region */ diff --git a/src/util/xmlpool/ca.po b/src/util/xmlpool/ca.po index 2c663d25027..15c5fa0f133 100644 --- a/src/util/xmlpool/ca.po +++ b/src/util/xmlpool/ca.po @@ -193,29 +193,6 @@ msgstr "" msgid "Performance" msgstr "Rendiment" -#: t_options.h:238 -msgid "TCL mode (Transformation, Clipping, Lighting)" -msgstr "Mode TCL (Transformació, Retall, Il·luminació)" - -#: t_options.h:239 -msgid "Use software TCL pipeline" -msgstr "Utilitza la canonada TCL de programari" - -#: t_options.h:240 -msgid "Use hardware TCL as first TCL pipeline stage" -msgstr "Utilitza el TCL de maquinari com a la primera fase de la canonada TCL" - -#: t_options.h:241 -msgid "Bypass the TCL pipeline" -msgstr "Passa per alt la canonada TCL" - -#: t_options.h:242 -msgid "" -"Bypass the TCL pipeline with state-based machine code generated on-the-fly" -msgstr "" -"Passa per alt la canonada TCL amb codi de màquina basat en estats, generat " -"sobre la marxa" - #: t_options.h:251 msgid "Method to limit rendering latency" msgstr "Mètode per a limitar la latència de renderització" diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po index 40095df3c40..683d33d4bc6 100644 --- a/src/util/xmlpool/de.po +++ b/src/util/xmlpool/de.po @@ -167,29 +167,6 @@ msgstr "" msgid "Performance" msgstr "Leistung" -#: t_options.h:238 -msgid "TCL mode (Transformation, Clipping, Lighting)" -msgstr "TCL-Modus (Transformation, Clipping, Licht)" - -#: t_options.h:239 -msgid "Use software TCL pipeline" -msgstr "Benutze die Software-TCL-Pipeline" - -#: t_options.h:240 -msgid "Use hardware TCL as first TCL pipeline stage" -msgstr "Benutze Hardware TCL als erste Stufe der TCL-Pipeline" - -#: t_options.h:241 -msgid "Bypass the TCL pipeline" -msgstr "Umgehe die TCL-Pipeline" - -#: t_options.h:242 -msgid "" -"Bypass the TCL pipeline with state-based machine code generated on-the-fly" -msgstr "" -"Umgehe die TCL-Pipeline mit zur Laufzeit erzeugtem, zustandsbasiertem " -"Maschinencode" - #: t_options.h:251 msgid "Method to limit rendering latency" msgstr "Methode zur Begrenzung der Bildverzögerung" diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po index b1cfdd6e146..8b841c682fe 100644 --- a/src/util/xmlpool/es.po +++ b/src/util/xmlpool/es.po @@ -174,29 +174,6 @@ msgstr "" msgid "Performance" msgstr "Rendimiento" -#: t_options.h:238 -msgid "TCL mode (Transformation, Clipping, Lighting)" -msgstr "Modo TCL (Transformación, Recorte, Iluminación)" - -#: t_options.h:239 -msgid "Use software TCL pipeline" -msgstr "Usar tubería TCL por software" - -#: t_options.h:240 -msgid "Use hardware TCL as first TCL pipeline stage" -msgstr "Usar TCL por hardware en la primera fase de la tubería TCL" - -#: t_options.h:241 -msgid "Bypass the TCL pipeline" -msgstr "Pasar por alto la tubería TCL" - -#: t_options.h:242 -msgid "" -"Bypass the TCL pipeline with state-based machine code generated on-the-fly" -msgstr "" -"Pasar por alto la tubería TCL con código máquina basado en estados, generado " -"al vuelo" - #: t_options.h:251 msgid "Method to limit rendering latency" msgstr "Método para limitar la latencia de renderización" diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po index 39bb6035823..d8bab1a2139 100644 --- a/src/util/xmlpool/fr.po +++ b/src/util/xmlpool/fr.po @@ -162,29 +162,6 @@ msgstr "" msgid "Performance" msgstr "Performance" -#: t_options.h:238 -msgid "TCL mode (Transformation, Clipping, Lighting)" -msgstr "Mode de TCL (Transformation, Clipping, Eclairage)" - -#: t_options.h:239 -msgid "Use software TCL pipeline" -msgstr "Utiliser un pipeline TCL logiciel" - -#: t_options.h:240 -msgid "Use hardware TCL as first TCL pipeline stage" -msgstr "Utiliser le TCL matériel pour le premier niveau de pipeline" - -#: t_options.h:241 -msgid "Bypass the TCL pipeline" -msgstr "Court-circuiter le pipeline TCL" - -#: t_options.h:242 -msgid "" -"Bypass the TCL pipeline with state-based machine code generated on-the-fly" -msgstr "" -"Court-circuiter le pipeline TCL par une machine à états qui génère le codede " -"TCL à la volée" - #: t_options.h:251 msgid "Method to limit rendering latency" msgstr "Méthode d'attente de la carte graphique" diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po index 8dd73ca5dfe..e6fb5d1f9d7 100644 --- a/src/util/xmlpool/nl.po +++ b/src/util/xmlpool/nl.po @@ -162,29 +162,6 @@ msgstr "" msgid "Performance" msgstr "Prestatie" -#: t_options.h:238 -msgid "TCL mode (Transformation, Clipping, Lighting)" -msgstr "TCL-modus (Transformatie, Clipping, Licht)" - -#: t_options.h:239 -msgid "Use software TCL pipeline" -msgstr "Gebruik software TCL pijpleiding" - -#: t_options.h:240 -msgid "Use hardware TCL as first TCL pipeline stage" -msgstr "Gebruik hardware TCL as eerste TCL pijpleiding trap" - -#: t_options.h:241 -msgid "Bypass the TCL pipeline" -msgstr "Omzeil de TCL pijpleiding" - -#: t_options.h:242 -msgid "" -"Bypass the TCL pipeline with state-based machine code generated on-the-fly" -msgstr "" -"Omzeil de TCL pijpleiding met staatgebaseerde machinecode die tijdens " -"executie gegenereerd wordt" - #: t_options.h:251 msgid "Method to limit rendering latency" msgstr "Methode om beeldopbouwvertraging te onderdrukken" diff --git a/src/util/xmlpool/sv.po b/src/util/xmlpool/sv.po index 319caa73876..89072e66f22 100644 --- a/src/util/xmlpool/sv.po +++ b/src/util/xmlpool/sv.po @@ -162,28 +162,6 @@ msgstr "" msgid "Performance" msgstr "Prestanda" -#: t_options.h:238 -msgid "TCL mode (Transformation, Clipping, Lighting)" -msgstr "TCL-läge (Transformation, Clipping, Lighting)" - -#: t_options.h:239 -msgid "Use software TCL pipeline" -msgstr "Använd programvaru-TCL-rörledning" - -#: t_options.h:240 -msgid "Use hardware TCL as first TCL pipeline stage" -msgstr "Använd maskinvaru-TCL som första TCL-rörledningssteg" - -#: t_options.h:241 -msgid "Bypass the TCL pipeline" -msgstr "KringgÃ¥ TCL-rörledningen" - -#: t_options.h:242 -msgid "" -"Bypass the TCL pipeline with state-based machine code generated on-the-fly" -msgstr "" -"KringgÃ¥ TCL-rörledningen med tillstÃ¥ndsbaserad maskinkod som direktgenereras" - #: t_options.h:251 msgid "Method to limit rendering latency" msgstr "Metod för att begränsa renderingslatens" diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h index 446674b46ab..8de806c4c8f 100644 --- a/src/util/xmlpool/t_options.h +++ b/src/util/xmlpool/t_options.h @@ -257,20 +257,6 @@ DRI_CONF_OPT_END DRI_CONF_SECTION_BEGIN \ DRI_CONF_DESC(en,gettext("Performance")) -#define DRI_CONF_TCL_SW 0 -#define DRI_CONF_TCL_PIPELINED 1 -#define DRI_CONF_TCL_VTXFMT 2 -#define DRI_CONF_TCL_CODEGEN 3 -#define DRI_CONF_TCL_MODE(def) \ -DRI_CONF_OPT_BEGIN_V(tcl_mode,enum,def,"0:3") \ - DRI_CONF_DESC_BEGIN(en,gettext("TCL mode (Transformation, Clipping, Lighting)")) \ - DRI_CONF_ENUM(0,gettext("Use software TCL pipeline")) \ - DRI_CONF_ENUM(1,gettext("Use hardware TCL as first TCL pipeline stage")) \ - DRI_CONF_ENUM(2,gettext("Bypass the TCL pipeline")) \ - DRI_CONF_ENUM(3,gettext("Bypass the TCL pipeline with state-based machine code generated on-the-fly")) \ - 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