Backport Wave pragma fix and remove workaround

Point Boost to the exact Wave one-line backport for emitted pragma newlines, remove the temporary local pragma workaround, and keep the remaining include-path fixes in Nabla.

This leaves the Wave pragma issue fixed at the dependency level while preserving the Nabla-side fixes for Windows backslash includes and single-leading-slash virtual includes.

Thanks to @Themperror for the additional pragma and include repros. Those made it straightforward to verify the dependency-level fix and drop the local workaround cleanly.

Author: AnastaZIuk

3rdparty/boost/superproject

@@ -316,10 +316,6 @@ std::string preprocessImpl(
     std::function<void(nbl::wave::context&)> post)
 {
     nbl::wave::context context(code.begin(), code.end(), preprocessOptions.sourceIdentifier.data(), { preprocessOptions });
-    context.set_caching(withCaching);
-    context.add_macro_definition("__HLSL_VERSION");
-    context.add_macro_definition("__SPIRV_MAJOR_VERSION__=" + std::to_string(IShaderCompiler::getSpirvMajor(preprocessOptions.targetSpirvVersion)));
-    context.add_macro_definition("__SPIRV_MINOR_VERSION__=" + std::to_string(IShaderCompiler::getSpirvMinor(preprocessOptions.targetSpirvVersion)));
 
     WaveRenderProgress renderProgress;
     const char* phase = "registering built-in macros";
@@ -335,6 +331,11 @@ std::string preprocessImpl(
     };
     try
     {
+        context.set_caching(withCaching);
+        context.add_macro_definition("__HLSL_VERSION");
+        context.add_macro_definition("__SPIRV_MAJOR_VERSION__=" + std::to_string(IShaderCompiler::getSpirvMajor(preprocessOptions.targetSpirvVersion)));
+        context.add_macro_definition("__SPIRV_MINOR_VERSION__=" + std::to_string(IShaderCompiler::getSpirvMinor(preprocessOptions.targetSpirvVersion)));
+
         phase = "registering extra macro definitions";
         for (const auto& define : preprocessOptions.extraDefines)
         {

src/nbl/asset/utils/CWaveStringResolver.cpp

@@ -627,6 +627,25 @@ auto IShaderCompiler::CFileSystemIncludeLoader::getInclude(const system::path& s
     return { f->getFileName(),std::move(contents) };
 }
 
+namespace
+{
+std::string normalizeIncludeLookupName(const std::string& includeName)
+{
+    if (includeName.size() <= 1ull)
+        return includeName;
+
+    const auto first = includeName.front();
+    const auto second = includeName[1ull];
+    const bool hasSingleLeadingSeparator =
+        (first == '/' || first == '\\') &&
+        second != '/' && second != '\\';
+    if (!hasSingleLeadingSeparator)
+        return includeName;
+
+    return includeName.substr(1ull);
+}
+}
+
 IShaderCompiler::CIncludeFinder::CIncludeFinder(core::smart_refctd_ptr<system::ISystem>&& system)
     : m_defaultFileSystemLoader(core::make_smart_refctd_ptr<CFileSystemIncludeLoader>(std::move(system)))
 {
@@ -639,12 +658,13 @@ IShaderCompiler::CIncludeFinder::CIncludeFinder(core::smart_refctd_ptr<system::I
 // @param 
 auto IShaderCompiler::CIncludeFinder::getIncludeStandard(const system::path& requestingSourceDir, const std::string& includeName) const -> IIncludeLoader::found_t
 {
+    const auto lookupName = normalizeIncludeLookupName(includeName);
     IShaderCompiler::IIncludeLoader::found_t retVal;
-    if (auto contents = tryIncludeGenerators(includeName))
+    if (auto contents = tryIncludeGenerators(lookupName))
         retVal = std::move(contents);
-    else if (auto contents = trySearchPaths(includeName))
+    else if (auto contents = trySearchPaths(lookupName))
         retVal = std::move(contents);
-    else retVal = m_defaultFileSystemLoader->getInclude(requestingSourceDir.string(), includeName);
+    else retVal = m_defaultFileSystemLoader->getInclude(requestingSourceDir.string(), lookupName);
 
 
     core::blake3_hasher hasher;
@@ -658,10 +678,11 @@ auto IShaderCompiler::CIncludeFinder::getIncludeStandard(const system::path& req
 // @param includeName: the string within "" of the include preprocessing directive
 auto IShaderCompiler::CIncludeFinder::getIncludeRelative(const system::path& requestingSourceDir, const std::string& includeName) const -> IIncludeLoader::found_t
 {
+    const auto lookupName = normalizeIncludeLookupName(includeName);
     IShaderCompiler::IIncludeLoader::found_t retVal;
-    if (auto contents = m_defaultFileSystemLoader->getInclude(requestingSourceDir.string(), includeName))
+    if (auto contents = m_defaultFileSystemLoader->getInclude(requestingSourceDir.string(), lookupName))
         retVal = std::move(contents);
-    else retVal = std::move(trySearchPaths(includeName));
+    else retVal = std::move(trySearchPaths(lookupName));
 
     core::blake3_hasher hasher;
     hasher.update(reinterpret_cast<uint8_t*>(retVal.contents.data()), retVal.contents.size() * (sizeof(char) / sizeof(uint8_t)));

src/nbl/asset/utils/IShaderCompiler.cpp

@@ -8,6 +8,7 @@
 #include <boost/wave.hpp>
 #include <boost/wave/cpplexer/cpp_lex_token.hpp>
 #include <boost/wave/cpplexer/cpp_lex_iterator.hpp>
+#include <string_view>
 #include <unordered_set>
 
 #include "nbl/asset/utils/IShaderCompiler.h"