Fix issues with tcpp being weird

Author: deprilula28

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -184,10 +184,6 @@ std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
         }
     );
 
-    proc.AddCustomDirectiveHandler(std::string("line"), [&](tcpp::Preprocessor& preprocessor, tcpp::Lexer& lexer, const std::string& text) {
-        while (lexer.HasNextToken() && lexer.GetNextToken().mType != tcpp::E_TOKEN_TYPE::NEWLINE) {}
-        return std::string("");
-    });
     proc.AddCustomDirectiveHandler(std::string("pragma shader_stage"), [&](tcpp::Preprocessor& preprocessor, tcpp::Lexer& lexer, const std::string& text) {
         if (!lexer.HasNextToken()) return std::string("#error Malformed shader_stage pragma");
         auto token = lexer.GetNextToken();
@@ -229,7 +225,6 @@ std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
 
     auto resolvedString = proc.Process();
     IShaderCompiler::reenableDirectives(resolvedString);
-
     return resolvedString;
 }
 

src/nbl/asset/utils/IShaderCompiler.cpp

@@ -60,6 +60,7 @@ std::string IShaderCompiler::encloseWithinExtraInclGuards(std::string&& _code, u
         return undefs;
     };
 
+    // HACK: tcpp is having issues parsing the string, so this is a hack/mitigation that could be removed once tcpp is fixed
     std::string identifier = _identifier;
     std::replace(identifier.begin(), identifier.end(), '\\', '/');
 
@@ -68,7 +69,8 @@ std::string IShaderCompiler::encloseWithinExtraInclGuards(std::string&& _code, u
         "\n"
         "#ifndef " + defBase_ + std::to_string(_maxInclusions) +
         "\n" +
-        "#line 1 \"" + identifier.c_str() + "\"\n" +
+        // This will get turned back into #line after the directives get re-enabled
+        PREPROC_DIRECTIVE_DISABLER + "line 1 \"" + identifier.c_str() + "\"\n" +
         _code +
         "\n"
         "#endif"