Merge branch 'master' into new-sampler-concepts

# Conflicts:
#	examples_tests

Author: karimsayedre

.github/workflows/build-nabla.yml

@@ -84,6 +84,13 @@ jobs:
             Set-MpPreference -DisableArchiveScanning $true
             Set-MpPreference -DisableScanningMappedNetworkDrivesForFullScan $true
 
+            # workaround for Docker issue in windows runner
+            # see <https://github.com/actions/runner-images/issues/13729#issuecomment-4183956802>
+            $dockerState = Get-Service -Name "docker"
+            if ($dockerState.Status -ne "Running") {
+              Start-Service -Name "docker"
+            }
+
             $maxAttempts = 12
             $delaySeconds = 5
             $dockerReady = $false

examples_tests

@@ -245,6 +245,9 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 				@includeFinder Optional parameter; if not nullptr, it will resolve the includes in the code
 				@maxSelfInclusionCount used only when includeFinder is not nullptr
 				@extraDefines adds extra defines to the shader before compilation
+			@optimizerIsExtraPasses Instead of entirely replacing the default optimization passes, run the provided passes after the default ones
+			@preprocessedOutputPath If not empty, the preprocessed shader will be saved to this path
+			@spvOutputPath If not empty, the compiled SPIR-V binary will be saved to this path
 		*/
 		struct SCompilerOptions
 		{
@@ -261,6 +264,9 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 			SPreprocessorOptions preprocessorOptions = {};
 			CCache* readCache = nullptr;
 			CCache* writeCache = nullptr;
+			bool optimizerIsExtraPasses = false; // Instead of disabling the default opt passes, run the provided optimization passes at the end
+			std::string preprocessedOutputPath = "";
+			std::string spvOutputPath = "";
 		};
 
 		class CCache final : public IReferenceCounted
@@ -269,7 +275,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 
 			public:
 				// Used to check compatibility of Caches before reading
-				constexpr static inline std::string_view VERSION = "1.1.0";
+				constexpr static inline std::string_view VERSION = "1.1.1";
 
 				static auto const SHADER_BUFFER_SIZE_BYTES = sizeof(uint64_t) / sizeof(uint8_t); // It's obviously 8
 
@@ -361,7 +367,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 						public:
 							inline bool operator==(const SCompilerArgs& other) const {
 								bool retVal = true;
-								if (stage != other.stage || targetSpirvVersion != other.targetSpirvVersion || debugInfoFlags != other.debugInfoFlags || preprocessorArgs != other.preprocessorArgs) retVal = false;
+								if (stage != other.stage || targetSpirvVersion != other.targetSpirvVersion || debugInfoFlags != other.debugInfoFlags || preprocessorArgs != other.preprocessorArgs || optimizerIsExtraPasses != other.optimizerIsExtraPasses) retVal = false;
 								if (optimizerPasses.size() != other.optimizerPasses.size()) retVal = false;
 								for (auto passesIt = optimizerPasses.begin(), otherPassesIt = other.optimizerPasses.begin(); passesIt != optimizerPasses.end(); passesIt++, otherPassesIt++) {
 									if (*passesIt != *otherPassesIt) {
@@ -389,6 +395,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 							// Only SEntry should instantiate this struct
 							SCompilerArgs(const SCompilerOptions& options)
 								: stage(options.stage), targetSpirvVersion(options.preprocessorOptions.targetSpirvVersion), debugInfoFlags(options.debugInfoFlags), preprocessorArgs(options.preprocessorOptions)
+								, optimizerIsExtraPasses(options.optimizerIsExtraPasses)
 							{
 								if (options.spirvOptimizer) {
 									for (auto pass : options.spirvOptimizer->getPasses())
@@ -399,6 +406,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 							IShader::E_SHADER_STAGE stage;
 							E_SPIRV_VERSION targetSpirvVersion;
 							std::vector<ISPIRVOptimizer::E_OPTIMIZER_PASS> optimizerPasses;
+							bool optimizerIsExtraPasses;
 							core::bitflag<E_DEBUG_INFO_FLAGS> debugInfoFlags;
 							SPreprocessorArgs preprocessorArgs;
 					};
@@ -458,6 +466,9 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 
 					bool setContent(const asset::ICPUBuffer* uncompressedSpirvBuffer);
 
+					IShader::E_SHADER_STAGE getShaderStage() const { return compilerArgs.stage; }
+					SPreprocessorArgs getPreprocessorArgs() const { return compilerArgs.preprocessorArgs; }
+
 					core::smart_refctd_ptr<IShader> decompressShader() const;
 
 					// TODO: make some of these private