Merge pull request #984 from Devsh-Graphics-Programming/nsc_macro_def_fix

Author: AnastaZIuk

src/nbl/asset/utils/CWaveStringResolver.cpp

@@ -58,15 +58,21 @@ namespace nbl::wave
         // now define them as "NBL_GLSL_LIMIT_MAX_IMAGE_DIMENSION_1D=32768" 
         // to match boost wave syntax
         // https://www.boost.org/doc/libs/1_82_0/libs/wave/doc/class_reference_context.html#:~:text=Maintain%20defined%20macros-,add_macro_definition,-bool%20add_macro_definition
-        for (const auto& define : preprocessOptions.extraDefines)
-            context.add_macro_definition(define.identifier.data() + core::string("=") + define.definition.data());
 
         // preprocess
         core::string resolvedString;
         try
         {
+            for (const auto& define : preprocessOptions.extraDefines)
+            {
+                std::string macroDefinition(define.identifier);
+                macroDefinition.push_back('=');
+                macroDefinition.append(define.definition);
+                context.add_macro_definition(macroDefinition);
+            }
+
             auto stream = std::stringstream();
-            for (auto i= context.begin(); i!= context.end(); i++)
+            for (auto i = context.begin(); i != context.end(); i++)
                 stream << i->get_value();
             resolvedString = stream.str();
         }
@@ -85,4 +91,4 @@ namespace nbl::wave
 
         return resolvedString;
     }
-}
+}

tools/nsc/main.cpp

@@ -472,6 +472,47 @@ class ShaderCompiler final : public IApplicationFramework
         for (const auto& p : m_include_search_paths)
             includeFinder->addSearchPath(p, includeLoader);
 
+        // need this struct becuase fields of IShaderCompiler::SMacroDefinition are string views
+        struct SMacroDefinitionBuffer
+        {
+            std::string identifier;
+            std::string definition;
+        };
+
+        core::vector<SMacroDefinitionBuffer> macroDefinitionBuffers;
+        core::vector<IShaderCompiler::SMacroDefinition> macroDefinitions;
+        {
+            for (const auto& argument : m_arguments)
+            {
+                if (argument.rfind("-D", 0) != 0)
+                    continue;
+
+                std::string argumentTmp = argument.substr(2);
+
+                std::string identifier;
+                std::string definition;
+
+                const size_t equalPos = argumentTmp.find('=');
+                if (equalPos == std::string::npos)
+                {
+                    identifier = argumentTmp;
+                    definition = "1";
+                }
+                else
+                {
+                    identifier = argumentTmp.substr(0, equalPos);
+                    definition = argumentTmp.substr(equalPos + 1);
+                }
+
+                macroDefinitionBuffers.emplace_back(identifier, definition);
+            }
+
+            macroDefinitions.reserve(macroDefinitionBuffers.size());
+
+            for (const auto& macroDefinitionBuffer : macroDefinitionBuffers)
+                macroDefinitions.emplace_back(macroDefinitionBuffer.identifier, macroDefinitionBuffer.definition);
+        }
+
         if (preprocessOnly)
         {
             CHLSLCompiler::SPreprocessorOptions opt = {};
@@ -480,6 +521,7 @@ class ShaderCompiler final : public IApplicationFramework
             opt.includeFinder = includeFinder.get();
             opt.depfile = dep.enabled;
             opt.depfilePath = dep.path;
+            opt.extraDefines = macroDefinitions;
 
             const char* codePtr = (const char*)shader->getContent()->getPointer();
             std::string_view code(codePtr, std::strlen(codePtr));
@@ -497,6 +539,7 @@ class ShaderCompiler final : public IApplicationFramework
         opt.preprocessorOptions.includeFinder = includeFinder.get();
         opt.preprocessorOptions.depfile = dep.enabled;
         opt.preprocessorOptions.depfilePath = dep.path;
+        opt.preprocessorOptions.extraDefines = macroDefinitions;
         opt.debugInfoFlags = bitflag<IShaderCompiler::E_DEBUG_INFO_FLAGS>(IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_TOOL_BIT);
         opt.dxcOptions = std::span<std::string>(m_arguments);