Add filename escaping

Author: deprilula28

include/nbl/asset/utils/IShaderCompiler.h

@@ -257,6 +257,8 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 			}
 		}
 
+		static std::string escapeFilename(std::string&& code);
+
 		static void disableAllDirectivesExceptIncludes(std::string& _code);
 
 		static void reenableDirectives(std::string& _code);

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -102,13 +102,9 @@ static tcpp::IInputStream* getInputStreamInclude(
     IShaderCompiler::disableAllDirectivesExceptIncludes(res_str);
     res_str = IShaderCompiler::encloseWithinExtraInclGuards(std::move(res_str), maxInclCnt, name.string().c_str());
     res_str = res_str + "\n" +
-        IShaderCompiler::PREPROC_DIRECTIVE_DISABLER + "line " + std::to_string(lineGoBackTo) + " \"" +  includeStack.back().second + "\"\n";
+        IShaderCompiler::PREPROC_DIRECTIVE_DISABLER + "line " + std::to_string(lineGoBackTo).c_str() + " \"" + includeStack.back().second.c_str() + "\"\n";
 
-    // avoid warnings about improperly escaping
-    std::string identifier = name.string().c_str();
-    std::replace(identifier.begin(), identifier.end(), '\\', '/');
-
-    includeStack.push_back(std::pair<uint32_t, std::string>(lineGoBackTo, identifier));
+    includeStack.push_back(std::pair<uint32_t, std::string>(lineGoBackTo, IShaderCompiler::escapeFilename(name.string())));
 
     return new tcpp::StringInputStream(std::move(res_str));
 }

src/nbl/asset/utils/IShaderCompiler.cpp

@@ -12,6 +12,19 @@
 using namespace nbl;
 using namespace nbl::asset;
 
+std::string IShaderCompiler::escapeFilename(std::string&& code)
+{
+    std::string dest;
+    for (char c : code)
+    {
+        if (c == '\\')
+            dest.append("\\" "\\");
+        else 
+            dest.push_back(c);
+    }
+    return dest;
+}
+
 //all "#", except those in "#include"/"#version"/"#pragma shader_stage(...)", replaced with `PREPROC_DIRECTIVE_DISABLER`
 void IShaderCompiler::disableAllDirectivesExceptIncludes(std::string& _code)
 {
@@ -56,10 +69,7 @@ std::string IShaderCompiler::encloseWithinExtraInclGuards(std::string&& _code, u
         return undefs;
     };
 
-    // avoid warnings about improperly escaping
-    std::string identifier = _identifier;
-    std::replace(identifier.begin(), identifier.end(), '\\', '/');
-
+    std::string identifier = IShaderCompiler::escapeFilename(_identifier);
     return
         genDefs() +
         "\n"