griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPU: Shader Preprocess: Escape more character in regex strings

Browse Source 
This is trying to fix a reported issue on some compilern with
regex not matching the template definitions
This commit is contained in:
Clément Foucault
2025-05-19 00:02:10 +02:00
parent 84298a8fd8
commit e1ac6a75d5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/glsl_preprocess/glsl_preprocess.hh
View File

@@ -324,7 +324,7 @@ class Preprocessor {
std::string out_str = str;
{
/* Transform template definition into macro declaration. */
std::regex regex(R"(template<([\w\d\n, ]+)>(\s\w+\s)(\w+)\()");
std::regex regex(R"(template<([\w\d\n\,\ ]+)>(\s\w+\s)(\w+)\()");
out_str = std::regex_replace(out_str, regex, "#define $3_TEMPLATE($1)$2$3@(");
}
{
@@ -385,7 +385,7 @@ class Preprocessor {
{
/* Replace explicit instantiation by macro call. */
/* Only `template ret_t fn<T>(args);` syntax is supported. */
std::regex regex_instance(R"(template \w+ (\w+)<([\w+, \n]+)>\(([\w+ ,\n]+)\);)");
std::regex regex_instance(R"(template \w+ (\w+)<([\w+\,\ \n]+)>\(([\w+\ \,\n]+)\);)");
/* Notice the stupid way of keeping the number of lines the same by copying the argument list
* inside a multi-line comment. */
out_str = std::regex_replace(out_str, regex_instance, "$1_TEMPLATE($2)/*$3*/");