Saving work

Author: Przemog1

03_DeviceSelectionAndSharedSources/Testers.h

@@ -178,8 +178,8 @@ class MergeTester final : public IntrospectionTesterBase
 		confirmExpectedOutput(logger, pplnIntroData->merge(introspections[0].get()), true);
 		// should merge successfully since pipeline layout of "shader_1.comp.hlsl" is compatible with "shader_0.comp.hlsl"
 		confirmExpectedOutput(logger, pplnIntroData->merge(introspections[1].get()), true);
-		// should not merge since pipeline layout of "shader_2.comp.hlsl" is not compatible with "shader_0.comp.hlsl"
-		confirmExpectedOutput(logger, pplnIntroData->merge(introspections[2].get()), false);
+		// should merge since pipeline layout of "shader_2.comp.hlsl" is not compatible with "shader_0.comp.hlsl"
+		confirmExpectedOutput(logger, pplnIntroData->merge(introspections[2].get()), true);
 
 		pplnIntroData = core::make_smart_refctd_ptr<CSPIRVIntrospector::CPipelineIntrospectionData>();
 
@@ -190,8 +190,8 @@ class MergeTester final : public IntrospectionTesterBase
 
 		// should merge successfully since shader is not messed up and it is the first merge
 		confirmExpectedOutput(logger, pplnIntroData->merge(introspections[4].get()), true);
-		// TODO: idk what should happen when last binding in introspection is fixed-length sized array and last binding in introspection to merge is run-time sized array
-		confirmExpectedOutput(logger, pplnIntroData->merge(introspections[5].get()), false);
+		// TODO: should merge successfully since shader 5 is compatible with shader 4, it is allowed for last binding in one shader to be run-time sized and statically sized in the other
+		confirmExpectedOutput(logger, pplnIntroData->merge(introspections[5].get()), true);
 	}
 };
 

03_DeviceSelectionAndSharedSources/main.cpp

@@ -51,28 +51,25 @@ class DeviceSelectionAndSharedSourcesApp final : public application_templates::M
 			mergeTester.performTests(m_physicalDevice, m_device.get(), m_logger.get(), m_assetMgr.get());
 
 			// testing creation of compute pipeline layouts compatible for multiple shaders
-			PredefinedLayoutTester layoutTester("");
+			PredefinedLayoutTester layoutTester("CPSIRVIntrospector::createApproximateComputePipelineFromIntrospection");
 			layoutTester.performTests(m_physicalDevice, m_device.get(), m_logger.get(), m_assetMgr.get());
 
 			SandboxTester sandboxTester("unknown");
 			sandboxTester.performTests(m_physicalDevice, m_device.get(), m_logger.get(), m_assetMgr.get());
 		}
-		
 
-		m_logger->log("------- shader.comp.hlsl INTROSPECTION -------", ILogger::E_LOG_LEVEL::ELL_WARNING);
 		CSPIRVIntrospector introspector;
 		auto mainShader = this->compileShaderAndTestIntrospection("app_resources/shader.comp.hlsl", introspector);
 		auto source = mainShader.first;
 		auto mainShaderIntrospection = mainShader.second;
+
 		//mainShaderIntrospection->debugPrint(m_logger.get());
-		// auto source2 = this->compileShaderAndTestIntrospection("app_resources/shader.comp.hlsl", introspector); // to make sure caching works
 
 		// We've now skipped the manual creation of a descriptor set layout, pipeline layout
 		ICPUShader::SSpecInfo specInfo;
 		specInfo.entryPoint = "main";
 		specInfo.shader = source.get();
 
-		m_logger->log("------- shader.comp.hlsl PIPELINE CREATION -------", ILogger::E_LOG_LEVEL::ELL_WARNING);
 		smart_refctd_ptr<nbl::asset::ICPUComputePipeline> cpuPipeline = introspector.createApproximateComputePipelineFromIntrospection(specInfo);
 
 		smart_refctd_ptr<IGPUShader> shader = m_device->createShader(source.get());