move targetSpirvVersion from SCompilerOptions to SPreprocessorOptions, define __SPIRV_MAJOR_VERSION__ and __SPIRV_MINOR_VERSION__, update examples_tests submodules

Author: AnastaZIuk

examples_tests

@@ -118,18 +118,27 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 			std::string_view definition;
 		};
 
+		//
+		using E_SPIRV_VERSION = nbl::hlsl::SpirvVersion;
+
+		static inline constexpr uint32_t getSpirvMajor(E_SPIRV_VERSION version) {
+			return (version >> 16u) & 0xFFu;
+		}
+
+		static inline constexpr uint32_t getSpirvMinor(E_SPIRV_VERSION version) {
+			return (version >> 8u) & 0xFFu;
+		}
+
 		//
 		struct SPreprocessorOptions
 		{
 			std::string_view sourceIdentifier = "";
 			system::logger_opt_ptr logger = nullptr;
 			const CIncludeFinder* includeFinder = nullptr;
 			std::span<const SMacroDefinition> extraDefines = {};
+			E_SPIRV_VERSION targetSpirvVersion = E_SPIRV_VERSION::ESV_1_6;
 		};
 
-		//
-		using E_SPIRV_VERSION = nbl::hlsl::SpirvVersion;
-
 		// https://github.com/microsoft/DirectXShaderCompiler/blob/main/docs/SPIR-V.rst#debugging
 		enum class E_DEBUG_INFO_FLAGS : uint8_t
 		{
@@ -169,7 +178,6 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 			virtual IShader::E_CONTENT_TYPE getCodeContentType() const { return IShader::E_CONTENT_TYPE::ECT_UNKNOWN; };
 
 			IShader::E_SHADER_STAGE stage = IShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY;
-			E_SPIRV_VERSION targetSpirvVersion = E_SPIRV_VERSION::ESV_1_6;
 			const ISPIRVOptimizer* spirvOptimizer = nullptr;
 			core::bitflag<E_DEBUG_INFO_FLAGS> debugInfoFlags = core::bitflag<E_DEBUG_INFO_FLAGS>(E_DEBUG_INFO_FLAGS::EDIF_SOURCE_BIT) | E_DEBUG_INFO_FLAGS::EDIF_TOOL_BIT;
 			SPreprocessorOptions preprocessorOptions = {};
@@ -301,7 +309,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 
 							// Only SEntry should instantiate this struct
 							SCompilerArgs(const SCompilerOptions& options)
-								: stage(options.stage), targetSpirvVersion(options.targetSpirvVersion), debugInfoFlags(options.debugInfoFlags), preprocessorArgs(options.preprocessorOptions)
+								: stage(options.stage), targetSpirvVersion(options.preprocessorOptions.targetSpirvVersion), debugInfoFlags(options.debugInfoFlags), preprocessorArgs(options.preprocessorOptions)
 							{
 								if (options.spirvOptimizer) {
 									for (auto pass : options.spirvOptimizer->getPasses())

include/nbl/asset/utils/IShaderCompiler.h

@@ -266,7 +266,7 @@ core::smart_refctd_ptr<IShader> CGLSLCompiler::compileToSPIRV_impl(const std::st
 
     shaderc::Compiler comp;
     shaderc::CompileOptions shadercOptions; //default options
-    shadercOptions.SetTargetSpirv(static_cast<shaderc_spirv_version>(glslOptions.targetSpirvVersion));
+    shadercOptions.SetTargetSpirv(static_cast<shaderc_spirv_version>(glslOptions.preprocessorOptions.targetSpirvVersion));
     const shaderc_shader_kind stage = glslOptions.stage == IShader::E_SHADER_STAGE::ESS_UNKNOWN ? shaderc_glsl_infer_from_source : ESStoShadercEnum(glslOptions.stage);
     if (glslOptions.debugInfoFlags.value != IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_NONE)
         shadercOptions.SetGenerateDebugInfo();

src/nbl/asset/utils/CGLSLCompiler.cpp

@@ -346,7 +346,7 @@ static DxcCompilationResult dxcCompile(const CHLSLCompiler* compiler, nbl::asset
 
 namespace nbl::wave
 {
-    extern nbl::core::string resolveString(std::string& code, const IShaderCompiler::SPreprocessorOptions& preprocessOptions, bool withCaching, std::function<void(nbl::wave::context&)> post);
+    extern nbl::core::string preprocess(std::string& code, const IShaderCompiler::SPreprocessorOptions& preprocessOptions, bool withCaching, std::function<void(nbl::wave::context&)> post);
 }
 
 std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADER_STAGE& stage, const SPreprocessorOptions& preprocessOptions, std::vector<std::string>& dxc_compile_flags_override, std::vector<CCache::SEntry::SPreprocessingDependency>* dependencies) const
@@ -365,7 +365,7 @@ std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
     }
 
     // preprocess
-    core::string resolvedString = nbl::wave::resolveString(code, preprocessOptions, bool(dependencies) /* if dependencies were passed, we assume we want caching*/, 
+    core::string resolvedString = nbl::wave::preprocess(code, preprocessOptions, bool(dependencies) /* if dependencies were passed, we assume we want caching*/, 
         [&dxc_compile_flags_override, &stage, &dependencies](nbl::wave::context& context) -> void
         {
             if (context.get_hooks().m_dxc_compile_flags_override.size() != 0)
@@ -435,7 +435,7 @@ core::smart_refctd_ptr<IShader> CHLSLCompiler::compileToSPIRV_impl(const std::st
             for (size_t i = 0; i < required.size(); i++)
                 arguments.push_back(required[i]);
             //
-            switch (options.targetSpirvVersion)
+            switch (options.preprocessorOptions.targetSpirvVersion)
             {
                 case hlsl::SpirvVersion::ESV_1_4:
                     arguments.push_back(L"-fspv-target-env=vulkan1.1spirv1.4");

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -22,7 +22,7 @@
 
     in Debug/RWDI
 
-    then make resolveString full C API with raw in/out pointers and bytes out pointer,
+    then make preprocess full C API with raw in/out pointers and bytes out pointer,
     with mismtach we must be very careful about memory ownership as STL stuff will have
     different struct layouts and its easy to make a crash, we will have extra memcpy and
     deallocation but as a trade each config will have almost the same preprocessing perf
@@ -33,6 +33,8 @@
 
     NOTE: this approach allows to do all in single Nabla module, no extra proxy/fake shared DLL needed!
     NOTE: yep I know I have currently a callback for which context size will differ accross TUs afterwards but will think about it
+
+    or ignore it and take care of NSC special target creating global HLSL PCH injected into each registered input
 */
 
 #include "nbl/asset/utils/IShaderCompiler.h"
@@ -44,11 +46,13 @@ using namespace nbl::asset;
 
 namespace nbl::wave
 {
-    std::string resolveString(std::string& code, const nbl::asset::IShaderCompiler::SPreprocessorOptions& preprocessOptions, bool withCaching, std::function<void(nbl::wave::context&)> post)
+    std::string preprocess(std::string& code, const nbl::asset::IShaderCompiler::SPreprocessorOptions& preprocessOptions, bool withCaching, 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)));
 
         // instead of defining extraDefines as "NBL_GLSL_LIMIT_MAX_IMAGE_DIMENSION_1D 32768", 
         // now define them as "NBL_GLSL_LIMIT_MAX_IMAGE_DIMENSION_1D=32768" 

src/nbl/asset/utils/CWaveStringResolver.cpp

@@ -364,7 +364,7 @@ core::smart_refctd_ptr<asset::IShader> ILogicalDevice::compileShader(const SShad
             asset::IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_SOURCE_BIT |
             asset::IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_TOOL_BIT;
         commonCompileOptions.spirvOptimizer = creationParams.optimizer;
-        commonCompileOptions.targetSpirvVersion = m_physicalDevice->getLimits().spirvVersion;
+        commonCompileOptions.preprocessorOptions.targetSpirvVersion = m_physicalDevice->getLimits().spirvVersion;
 
         commonCompileOptions.readCache = creationParams.readCache;
         commonCompileOptions.writeCache = creationParams.writeCache;