KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swr/rast: non-regex knob fallback code for gcc < 4.9 

gcc prior to 4.9 didn't implement <regex>, causing a startup crash
in the swr knob parameter reading code.

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
Tim Rowley 2017-07-26 15:17:49 -05:00
parent 2c34b49d9e
commit e21fc2c625
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
View File

@ -140,6 +140,26 @@ extern GlobalKnobs g_GlobalKnobs;
//========================================================
void KnobBase::autoExpandEnvironmentVariables(std::string &text)
{
#if (__GNUC__) && (GCC_VERSION < 409000)
// <regex> isn't implemented prior to gcc-4.9.0
// unix style variable replacement
size_t start;
while ((start = text.find("${'${'}")) != std::string::npos) {
size_t end = text.find("}");
if (end == std::string::npos)
break;
const std::string var = GetEnv(text.substr(start + 2, end - start - 2));
text.replace(start, end - start + 1, var);
}
// win32 style variable replacement
while ((start = text.find("%")) != std::string::npos) {
size_t end = text.find("%", start + 1);
if (end == std::string::npos)
break;
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("\\$\\{([^}]+)\\}");
@ -164,6 +184,7 @@ void KnobBase::autoExpandEnvironmentVariables(std::string &text)
text.replace(match.prefix().length(), match[0].length(), var);
}
}
#endif
}