mesa: Use os_get_option() for MESA_*_OVERRIDE

This will allow for overriding via setprop mesa.*.override on android.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7763>

diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp
index aacaa46748e92b71873f4a71bb8ccdd9cf14f909..120712d220140748c824ff931abe38525348fc8a 100644 (file)
--- a/src/compiler/glsl/shader_cache.cpp
+++ b/src/compiler/glsl/shader_cache.cpp
@@ -44,6 +44,8 @@
  * corrupt, etc) we will use a fallback path to compile and link the IR.
  */
 
+#include "util/os_misc.h"
+
 #include "compiler/shader_info.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
@@ -188,7 +190,7 @@ shader_cache_read_program_metadata(struct gl_context *ctx,
     * preprocessor could result in different output and we could load the
     * wrong shader.
     */
-   char *ext_override = getenv("MESA_EXTENSION_OVERRIDE");
+   const char *ext_override = os_get_option("MESA_EXTENSION_OVERRIDE");
    if (ext_override) {
       ralloc_asprintf_append(&buf, "ext:%s", ext_override);
    }

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index d56f67844692ab5ef19fd34592f3ae62d0f43b7f..d2746f2b31f5cc0d9f8eccd6d4c0b76e7e09e783 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -29,6 +29,7 @@
  * \brief Extension handling
  */
 
+#include "util/os_misc.h"
 
 #include "glheader.h"
 
@@ -237,7 +238,7 @@ free_unknown_extensions_strings(void)
 void
 _mesa_one_time_init_extension_overrides(void)
 {
-   const char *env_const = getenv("MESA_EXTENSION_OVERRIDE");
+   const char *env_const = os_get_option("MESA_EXTENSION_OVERRIDE");
    char *env;
    char *ext;
    size_t offset;

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 2056d07d1a5d8c530cdd2558edcae4f80e2f3168..0f34b5e2de3826412f9de6620f9c0076bfc5ea4d 100644 (file)
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include "context.h"
 
+#include "util/os_misc.h"
 #include "util/simple_mtx.h"
 
 #include "mtypes.h"
@@ -84,7 +85,7 @@ get_gl_override(gl_api api, int *version, bool *fwd_context,
    if (override[api].version < 0) {
       override[api].version = 0;
 
-      version_str = getenv(env_var);
+      version_str = os_get_option(env_var);
       if (version_str) {
          override[api].fc_suffix = check_for_ending(version_str, "FC");
          override[api].compat_suffix = check_for_ending(version_str, "COMPAT");