mesa: drop legacy no_rast dri option

Add enviroment var overrides to legacy drivers instead.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 728d6d586998dd26f1e59c42a5aa7583c6c23f3d..abc16d47491d5c754715b198afc97901caa34ae0 100644 (file)
--- 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 3d4f7ae94aa7bc69bb6cbe97979e38dafbced964..50934c10c48651824464a2d4ab1653896c7c0adc 100644 (file)
--- 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 2222e57bbf4e424cd3f78ebf6a9396545d6b029b..923f9be3fbb33aa0c0f1ef7c569ede5fcd8304c4 100644 (file)
--- 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 cfdc9b84e870535b817fc71339f7265199041602..392c10fb74df0a5170f66133534a6aaf5e635bb6 100644 (file)
--- 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 e1e87640ef09839b176cd26eff0ec1b018e4910b..db1cc7274dbde313b56ba5a774538a49215570d1 100644 (file)
--- 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 009d7953a24d965733f782164cff7e4f6a137530..5637361a91655797dbb9c43e6ad14c317ff20947 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -95,9 +95,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
 };
 
@@ -128,9 +125,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 55d83f903fb00c8b8366328b154b90048400aaf1..8a338c0e33cf9a68eca47530457d8e089fddd5b9 100644 (file)
--- 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:70
 msgid "Enable flushing batchbuffer after each draw call"
 msgstr "Habilita el buidatge del batchbuffer després de cada trucada de dibuix"

diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po
index 5490940f5eef63f27c36e47b8858958b5105cf4f..9b7059ba8adbed8f9ad41263a32446ced7b16861 100644 (file)
--- 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:70
 msgid "Enable flushing batchbuffer after each draw call"
 msgstr "Aktiviere sofortige Leerung des Stapelpuffers nach jedem Zeichenaufruf"

diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po
index 7c9986cf4f0085d3d7bffe3cd786660087e6cdbe..baf6b6e2ec63db2146d55b2e986e9bc7130a9825 100644 (file)
--- 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:70
 msgid "Enable flushing batchbuffer after each draw call"
 msgstr "Habilitar vaciado del batchbuffer después de cada llamada de dibujo"

diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po
index 44c2990e89765a3ec294cf6299003df2d2029a07..23d8b4eaef9980e680d6e7018243732a415386d4 100644 (file)
--- 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:70
 msgid "Enable flushing batchbuffer after each draw call"
 msgstr ""

diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po
index e24afb2c53648d575c28d8ca13626336d00b7353..8d3d2e11ea01738b74b96268a4b4fca7d6e45336 100644 (file)
--- 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:70
 msgid "Enable flushing batchbuffer after each draw call"
 msgstr ""

diff --git a/src/util/xmlpool/sv.po b/src/util/xmlpool/sv.po
index 4e1632442ac26fa6773bee1bf4b7431b351de467..0b60017458364504e64a257d531d3eb25d445f7f 100644 (file)
--- 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:70
 msgid "Enable flushing batchbuffer after each draw call"
 msgstr ""

diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h
index ffcf6f85d3951a19afbc3505914add00f356bff0..fdb3a04477178c60de6b94c66a9bba875145af39 100644 (file)
--- 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_ALWAYS_FLUSH_BATCH(def) \
 DRI_CONF_OPT_BEGIN_B(always_flush_batch, def) \
         DRI_CONF_DESC(en,gettext("Enable flushing batchbuffer after each draw call")) \