Add enviroment var overrides to legacy drivers instead. --- src/mesa/drivers/dri/i915/intel_context.c | 2 +- src/mesa/drivers/dri/i915/intel_screen.c | 1 - src/mesa/drivers/dri/i965/intel_screen.c | 1 - src/mesa/drivers/dri/r200/r200_context.c | 2 +- src/mesa/drivers/dri/radeon/radeon_context.c | 2 +- src/mesa/drivers/dri/radeon/radeon_screen.c | 6 ------ src/util/xmlpool/ca.po | 4 ---- src/util/xmlpool/de.po | 4 ---- src/util/xmlpool/es.po | 4 ---- src/util/xmlpool/fr.po | 4 ---- src/util/xmlpool/nl.po | 4 ---- src/util/xmlpool/sv.po | 4 ---- src/util/xmlpool/t_options.h | 5 ----- 13 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index b970af3e467..4d8e0ac9484 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -535,7 +535,7 @@ intelInitContext(struct intel_context *intel, intel->prim.primitive = ~0; /* Force all software fallbacks */ - if (driQueryOptionb(&intel->optionCache, "no_rast")) { + if (getenv("INTEL_NO_RAST")) { fprintf(stderr, "disabling 3D rasterization\n"); intel->no_rast = 1; } diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 3d4f7ae94aa..50934c10c48 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -65,7 +65,6 @@ DRI_CONF_BEGIN DRI_CONF_SECTION_QUALITY DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG - DRI_CONF_NO_RAST("false") DRI_CONF_ALWAYS_FLUSH_BATCH("false") DRI_CONF_ALWAYS_FLUSH_CACHE("false") DRI_CONF_DISABLE_THROTTLING("false") diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index f1c195c5d14..94bcc049b8f 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -74,7 +74,6 @@ DRI_CONF_BEGIN DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG - DRI_CONF_NO_RAST("false") DRI_CONF_ALWAYS_FLUSH_BATCH("false") DRI_CONF_ALWAYS_FLUSH_CACHE("false") DRI_CONF_DISABLE_THROTTLING("false") diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 9417dfc8a7b..1ab7da8ef50 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -383,7 +383,7 @@ GLboolean r200CreateContext( gl_api api, (getenv("R200_GART_CLIENT_TEXTURES") != 0); tcl_mode = driQueryOptioni(&rmesa->radeon.optionCache, "tcl_mode"); - if (driQueryOptionb(&rmesa->radeon.optionCache, "no_rast")) { + if (getenv("R200_NO_RAST")) { fprintf(stderr, "disabling 3D acceleration\n"); FALLBACK(rmesa, R200_FALLBACK_DISABLE, 1); } diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 28ced814e59..6d29182ee9e 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -332,7 +332,7 @@ r100CreateContext( gl_api api, rmesa->radeon.do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS); tcl_mode = driQueryOptioni(&rmesa->radeon.optionCache, "tcl_mode"); - if (driQueryOptionb(&rmesa->radeon.optionCache, "no_rast")) { + if (getenv("RADEON_NO_RAST")) { fprintf(stderr, "disabling 3D acceleration\n"); FALLBACK(rmesa, RADEON_FALLBACK_DISABLE, 1); } else if (tcl_mode == DRI_CONF_TCL_SW || diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 438844aac0c..bca6a45e368 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -90,9 +90,6 @@ DRI_CONF_BEGIN DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC) DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) DRI_CONF_SECTION_END - DRI_CONF_SECTION_DEBUG - DRI_CONF_NO_RAST("false") - DRI_CONF_SECTION_END DRI_CONF_END }; @@ -117,9 +114,6 @@ DRI_CONF_BEGIN DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) DRI_CONF_TEXTURE_BLEND_QUALITY(1.0,"0.0:1.0") DRI_CONF_SECTION_END - DRI_CONF_SECTION_DEBUG - DRI_CONF_NO_RAST("false") - DRI_CONF_SECTION_END DRI_CONF_END }; #endif diff --git a/src/util/xmlpool/ca.po b/src/util/xmlpool/ca.po index 03bf29613fc..568be939eb8 100644 --- a/src/util/xmlpool/ca.po +++ b/src/util/xmlpool/ca.po @@ -39,10 +39,6 @@ msgstr "" msgid "Debugging" msgstr "Depuració" -#: t_options.h:60 -msgid "Disable 3D acceleration" -msgstr "Deshabilita l'acceleració 3D" - #: t_options.h:65 msgid "Show performance boxes" msgstr "Mostra les caixes de rendiment" diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po index 7b20d00a62c..9aa9c11e075 100644 --- a/src/util/xmlpool/de.po +++ b/src/util/xmlpool/de.po @@ -21,10 +21,6 @@ msgstr "" msgid "Debugging" msgstr "Fehlersuche" -#: t_options.h:60 -msgid "Disable 3D acceleration" -msgstr "3D-Beschleunigung abschalten" - #: t_options.h:65 msgid "Show performance boxes" msgstr "Zeige Performanceboxen" diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po index f9d950ac14d..581a30c3595 100644 --- a/src/util/xmlpool/es.po +++ b/src/util/xmlpool/es.po @@ -24,10 +24,6 @@ msgstr "" msgid "Debugging" msgstr "Depuración" -#: t_options.h:60 -msgid "Disable 3D acceleration" -msgstr "Deshabilitar aceleración 3D" - #: t_options.h:65 msgid "Show performance boxes" msgstr "Mostrar cajas de rendimiento" diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po index fa069652c2b..27a2a4f5e47 100644 --- a/src/util/xmlpool/fr.po +++ b/src/util/xmlpool/fr.po @@ -21,10 +21,6 @@ msgstr "" msgid "Debugging" msgstr "Debogage" -#: t_options.h:60 -msgid "Disable 3D acceleration" -msgstr "Désactiver l'accélération 3D" - #: t_options.h:65 msgid "Show performance boxes" msgstr "Afficher les boîtes de performance" diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po index 86cb6e96d96..dc8a73098eb 100644 --- a/src/util/xmlpool/nl.po +++ b/src/util/xmlpool/nl.po @@ -21,10 +21,6 @@ msgstr "" msgid "Debugging" msgstr "Debuggen" -#: t_options.h:60 -msgid "Disable 3D acceleration" -msgstr "3D versnelling uitschakelen" - #: t_options.h:65 msgid "Show performance boxes" msgstr "Laat prestatie boxjes zien" diff --git a/src/util/xmlpool/sv.po b/src/util/xmlpool/sv.po index d8d7353f408..33f389d6075 100644 --- a/src/util/xmlpool/sv.po +++ b/src/util/xmlpool/sv.po @@ -21,10 +21,6 @@ msgstr "" msgid "Debugging" msgstr "Felsökning" -#: t_options.h:60 -msgid "Disable 3D acceleration" -msgstr "Inaktivera 3D-accelerering" - #: t_options.h:65 msgid "Show performance boxes" msgstr "Visa prestandarutor" diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h index f0537e965b8..4c143009efe 100644 --- a/src/util/xmlpool/t_options.h +++ b/src/util/xmlpool/t_options.h @@ -55,11 +55,6 @@ DRI_CONF_SECTION_BEGIN \ DRI_CONF_DESC(en,gettext("Debugging")) -#define DRI_CONF_NO_RAST(def) \ -DRI_CONF_OPT_BEGIN_B(no_rast, def) \ - DRI_CONF_DESC(en,gettext("Disable 3D acceleration")) \ -DRI_CONF_OPT_END - #define DRI_CONF_PERFORMANCE_BOXES(def) \ DRI_CONF_OPT_BEGIN_B(performance_boxes, def) \ DRI_CONF_DESC(en,gettext("Show performance boxes")) \ -- 2.17.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev