Mesa (staging/20.0): gallium/swr: simplify environmental variabled expansion code

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 1a35b3d28691f5dd8dde36420af5090a05a350f3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a35b3d28691f5dd8dde36420af5090a05a350f3

Author: Krzysztof Raszkowski <krzysztof.raszkowski at intel.com>
Date:   Mon Feb 17 12:26:40 2020 +0100

gallium/swr: simplify environmental variabled expansion code

There were 2 versions of code doing the same thing.
Since std::regexp are locale-sensitive better is to leave old
good way to do this.
This commit fix problem with bd934ff613c006344e757dfdac9f136ead1b183a.

Reviewed-by: Jan Zielinski <jan.zielinski at intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3843>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3843>

---

 .../swr/rasterizer/codegen/templates/gen_knobs.cpp | 29 ----------------------
 1 file changed, 29 deletions(-)

diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
index b073f73e3a0..194499aa1e0 100644
--- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
+++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
@@ -43,9 +43,6 @@
 //========================================================
 void KnobBase::autoExpandEnvironmentVariables(std::string& text)
 {
-#if (__GNUC__) && (GCC_VERSION < 40900)
-    // <regex> isn't implemented prior to gcc-4.9.0
-    // unix style variable replacement
     size_t start;
     while ((start = text.find("${'${'}")) != std::string::npos)
     {
@@ -64,32 +61,6 @@ void KnobBase::autoExpandEnvironmentVariables(std::string& text)
         const std::string var = GetEnv(text.substr(start + 1, end - start - 1));
         text.replace(start, end - start + 1, var);
     }
-#else
-    {
-        // unix style variable replacement
-        static std::regex env("\\$\\{([^}]+?)\\}");
-        std::smatch       match;
-        while (std::regex_search(text, match, env))
-        {
-            const std::string var = GetEnv(match[1].str());
-            // certain combinations of gcc/libstd++ have problems with this
-            // text.replace(match[0].first, match[0].second, var);
-            text.replace(match.prefix().length(), match[0].length(), var);
-        }
-    }
-    {
-        // win32 style variable replacement
-        static std::regex env("%([^%]+?)%");
-        std::smatch       match;
-        while (std::regex_search(text, match, env))
-        {
-            const std::string var = GetEnv(match[1].str());
-            // certain combinations of gcc/libstd++ have problems with this
-            // text.replace(match[0].first, match[0].second, var);
-            text.replace(match.prefix().length(), match[0].length(), var);
-        }
-    }
-#endif
 }
 
 //========================================================