fix up the regexp for preprocessor disabling

devshgraphicsprogramming · devshgraphicsprogramming · commit c37a0d74abae · 2023-11-06T22:10:40.000+01:00
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit a316b52c0fad0e1cbce04b97db1e3a903c9872e8
+Subproject commit 847b470403f49a838e1f5df714365414f52b480f
diff --git a/src/nbl/asset/utils/CHLSLCompiler.cpp b/src/nbl/asset/utils/CHLSLCompiler.cpp
@@ -73,7 +73,6 @@ static tcpp::TInputStreamUniquePtr getInputStreamInclude(
     std::vector<std::pair<uint32_t, std::string>>& includeStack
 )
 {
-
     std::filesystem::path relDir;
     #ifdef NBL_EMBED_BUILTIN_RESOURCES
     const bool reqFromBuiltin = nbl::builtin::hasPathPrefix(requestingSource) || spirv::builtin::hasPathPrefix(requestingSource);
diff --git a/src/nbl/asset/utils/IShaderCompiler.cpp b/src/nbl/asset/utils/IShaderCompiler.cpp
@@ -30,7 +30,7 @@ std::string IShaderCompiler::escapeFilename(std::string&& code)
 void IShaderCompiler::disableAllDirectivesExceptIncludes(std::string& _code)
 {
     // TODO: replace this with a proper-ish proprocessor and includer one day
-    std::regex directive("#(?!(include|version|pragma shader_stage))");//all # not followed by "include" nor "version" nor "pragma shader_stage"
+    std::regex directive("#(?!(( |\t|\r|\v|\f)*(include|version|pragma shader_stage)))");//all # not followed by "include" nor "version" nor "pragma shader_stage"
     //`#pragma shader_stage(...)` is needed for determining shader stage when `_stage` param of IShaderCompiler functions is set to ESS_UNKNOWN
     _code = std::regex_replace(_code, directive, IShaderCompiler::PREPROC_DIRECTIVE_DISABLER);
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ static tcpp::TInputStreamUniquePtr getInputStreamInclude(`
`73`	`73`	`std::vector<std::pair<uint32_t, std::string>>& includeStack`
`74`	`74`	`)`
`75`	`75`	`{`
`76`		`-`
`77`	`76`	`std::filesystem::path relDir;`
`78`	`77`	`#ifdef NBL_EMBED_BUILTIN_RESOURCES`
`79`	`78`	`const bool reqFromBuiltin = nbl::builtin::hasPathPrefix(requestingSource) \|\| spirv::builtin::hasPathPrefix(requestingSource);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ std::string IShaderCompiler::escapeFilename(std::string&& code)`
`30`	`30`	`void IShaderCompiler::disableAllDirectivesExceptIncludes(std::string& _code)`
`31`	`31`	`{`
`32`	`32`	`// TODO: replace this with a proper-ish proprocessor and includer one day`
`33`		`- std::regex directive("#(?!(include\|version\|pragma shader_stage))");//all # not followed by "include" nor "version" nor "pragma shader_stage"`
	`33`	`+ std::regex directive("#(?!(( \|\t\|\r\|\v\|\f)*(include\|version\|pragma shader_stage)))");//all # not followed by "include" nor "version" nor "pragma shader_stage"`
`34`	`34`	//`#pragma shader_stage(...)` is needed for determining shader stage when `_stage` param of IShaderCompiler functions is set to ESS_UNKNOWN
`35`	`35`	`_code = std::regex_replace(_code, directive, IShaderCompiler::PREPROC_DIRECTIVE_DISABLER);`
`36`	`36`	`}`