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

Fix: GPU: Broken shader printf support

Browse Source 
Was using wrong type of data offset and not removing
the quote when outputing the strings.
This commit is contained in:
Clément Foucault
2024-10-16 16:44:56 +02:00
parent 0d7bfb0711
commit f38827802a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,7 +330,7 @@ class Preprocessor {
/* Example: `pri$$1(2@ b)$` > `{int c_ = print_header(1, 2); c_ = print_data(c_, b); }` */
{
std::regex regex(R"(pri\$\$?(\d{1,2})\()");
out_str = std::regex_replace(out_str, regex, "{int c_ = print_header($1, ");
out_str = std::regex_replace(out_str, regex, "{uint c_ = print_header($1u, ");
}
{
std::regex regex(R"(\@)");
@@ -379,7 +379,8 @@ class Preprocessor {
}
std::stringstream suffix;
for (const std::string &str_var : static_strings_) {
suffix << "// " << hash("string") << " " << hash_string(str_var) << " " << str_var << "\n";
std::string no_quote = str_var.substr(1, str_var.size() - 2);
suffix << "// " << hash("string") << " " << hash_string(str_var) << " " << no_quote << "\n";
}
return suffix.str();
}