Merge pull request #766 from Devsh-Graphics-Programming/ali_pel

devshgraphicsprogramming · web-flow · commit c7bc76da3340 · 2024-11-01T12:12:51.000+01:00
CHLSLCompiler: improve boost::wave exception error logging
diff --git a/src/nbl/asset/utils/CHLSLCompiler.cpp b/src/nbl/asset/utils/CHLSLCompiler.cpp
@@ -352,11 +352,13 @@ std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
     }
     catch (boost::wave::preprocess_exception& e)
     {
-        preprocessOptions.logger.log("Boost.Wave %s exception caught!",system::ILogger::ELL_ERROR,e.what());
+        preprocessOptions.logger.log("%s exception caught. %s [%s:%d:%d]",system::ILogger::ELL_ERROR,e.what(),e.description(),e.file_name(),e.line_no(),e.column_no());
+        return {};
     }
     catch (...)
     {
         preprocessOptions.logger.log("Unknown exception caught!",system::ILogger::ELL_ERROR);
+        return {};
     }
     
     // for debugging cause MSVC doesn't like to show more than 21k LoC in TextVisualizer

Original file line number	Diff line number	Diff line change
`@@ -352,11 +352,13 @@ std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE`
`352`	`352`	`}`
`353`	`353`	`catch (boost::wave::preprocess_exception& e)`
`354`	`354`	`{`
`355`		`- preprocessOptions.logger.log("Boost.Wave %s exception caught!",system::ILogger::ELL_ERROR,e.what());`
	`355`	`+ preprocessOptions.logger.log("%s exception caught. %s [%s:%d:%d]",system::ILogger::ELL_ERROR,e.what(),e.description(),e.file_name(),e.line_no(),e.column_no());`
	`356`	`+ return {};`
`356`	`357`	`}`
`357`	`358`	`catch (...)`
`358`	`359`	`{`
`359`	`360`	`preprocessOptions.logger.log("Unknown exception caught!",system::ILogger::ELL_ERROR);`
	`361`	`+ return {};`
`360`	`362`	`}`
`361`	`363`
`362`	`364`	`// for debugging cause MSVC doesn't like to show more than 21k LoC in TextVisualizer`