Modified ex 24 to test separable samplers and added conditional compilation for deifferent tests as defines in push_constants.hlsl

Author: Fletterio

07_StagingAndMultipleQueues/main.cpp

@@ -272,7 +272,7 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 			const nbl::video::IGPUDescriptorSetLayout::SBinding bindings[2] = {
 				{
 					.binding = 0,
-					.type = nbl::asset::IDescriptor::E_TYPE::ET_SAMPLED_IMAGE, // TODO: just an image descriptor type when separable samplers arrive
+					.type = nbl::asset::IDescriptor::E_TYPE::ET_SAMPLED_IMAGE,
 					.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
 					.stageFlags = IGPUShader::E_SHADER_STAGE::ESS_COMPUTE,
 					.count = 1,
@@ -379,10 +379,10 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 			m_histogramBufferMemPtrs[2] = m_histogramBufferMemPtrs[1] + HISTOGRAM_SIZE;
 		}
 
-		// TODO: Remove commented stuff below
-		/*IGPUSampler::SParams samplerParams;
+		// TODO: Remove stuff below
+		IGPUSampler::SParams samplerParams;
 		samplerParams.AnisotropicFilter = false;
-		core::smart_refctd_ptr<IGPUSampler> sampler = m_device->createSampler(samplerParams);*/
+		core::smart_refctd_ptr<IGPUSampler> sampler = m_device->createSampler(samplerParams);
 
 		IGPUDescriptorSet::SDescriptorInfo bufInfo;
 		bufInfo.desc = smart_refctd_ptr(histogramBuffer);
@@ -425,7 +425,7 @@ class StagingAndMultipleQueuesApp final : public application_templates::BasicMul
 				logFailAndTerminate("Couldn't create descriptor.");
 			view->setObjectDebugName(("Image View #"+std::to_string(imageToProcessId)).c_str());
 			imgInfo.desc = std::move(view);
-			imgInfo.info.image = { .sampler = nullptr, .imageLayout = IImage::LAYOUT::READ_ONLY_OPTIMAL };
+			imgInfo.info.image = { .imageLayout = IImage::LAYOUT::READ_ONLY_OPTIMAL };
 
 			IGPUDescriptorSet::SWriteDescriptorSet write[1] = {
 				{.dstSet = descSets[resourceIdx].get(), .binding = 0, .arrayElement = 0, .count = 1, .info = &imgInfo }

24_ColorSpaceTest/app_resources/present.frag.hlsl

@@ -1,16 +1,23 @@
 // Copyright (C) 2024-2024 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
+
 #pragma wave shader_stage(fragment)
 
 // vertex shader is provided by the fullScreenTriangle extension
 #include <nbl/builtin/hlsl/ext/FullScreenTriangle/SVertexAttributes.hlsl>
 using namespace nbl::hlsl::ext::FullScreenTriangle;
 
-[[vk::combinedImageSampler]][[vk::binding(0,3)]] Texture2DArray texture;
-[[vk::combinedImageSampler]][[vk::binding(0,3)]] SamplerState samplerState;
-
 #include "push_constants.hlsl"
+    
+#if defined(SEPARATED_IMMUTABLE) || defined(SEPARATED_MUTABLE)
+    [[vk::binding(0,3)]] Texture2DArray texture;
+    [[vk::binding(1,3)]] SamplerState samplerState;
+#else
+    [[vk::combinedImageSampler]][[vk::binding(0,3)]] Texture2DArray texture;
+    [[vk::combinedImageSampler]][[vk::binding(0,3)]] SamplerState samplerState;
+#endif
+
 [[vk::push_constant]] push_constants_t pc;
 
 [[vk::location(0)]] float32_t4 main(SVertexAttributes vxAttr) : SV_Target0

24_ColorSpaceTest/app_resources/push_constants.hlsl

@@ -2,6 +2,12 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
+// Tests for combined and separable image samplers. Make sure exactly one is defined
+#define COMBINED_IMMUTABLE
+//#define COMBINED_MUTABLE
+//#define SEPARATED_IMMUTABLE
+//#define SEPARATED_MUTABLE
+
 struct push_constants_t
 {
 	uint16_t2 grid;

24_ColorSpaceTest/main.cpp

@@ -17,6 +17,7 @@ using namespace asset;
 using namespace ui;
 using namespace video;
 
+// defines for sampler tests can be found in the file below
 #include "app_resources/push_constants.hlsl"
 
 
@@ -126,17 +127,47 @@ class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication
 					.AnisotropicFilter = 0
 				});
 
-				const IGPUDescriptorSetLayout::SBinding bindings[1] = {{
+#if defined(COMBINED_IMMUTABLE) || defined(COMBINED_MUTABLE)
+				const IGPUDescriptorSetLayout::SBinding bindings[1] = { {
 					.binding = 0,
 					.type = IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER,
 					.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
 					.stageFlags = IShader::ESS_FRAGMENT,
 					.count = 1,
+					#if defined(COMBINED_IMMUTABLE)
 					.samplers = &defaultSampler
-				}};
+					#else
+					.samplers = nullptr
+					#endif
+				}
+				};
+#else 
+				const IGPUDescriptorSetLayout::SBinding bindings[2] = { {
+					.binding = 0,
+					.type = IDescriptor::E_TYPE::ET_SAMPLED_IMAGE,
+					.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
+					.stageFlags = IShader::ESS_FRAGMENT,
+					.count = 1,
+					.samplers = nullptr
+				},
+				{
+					.binding = 1,
+					.type = IDescriptor::E_TYPE::ET_SAMPLER,
+					.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_NONE,
+					.stageFlags = IShader::ESS_FRAGMENT,
+					.count = 1,
+					#if defined(SEPARATED_IMMUTABLE)
+					.samplers = &defaultSampler
+					#else
+					.samplers = nullptr
+					#endif
+				}
+				};
+#endif
 				dsLayout = m_device->createDescriptorSetLayout(bindings);
 				if (!dsLayout)
 					return logFail("Failed to Create Descriptor Layout");
+
 			}
 
 			ISwapchain::SCreationParams swapchainParams = {.surface=m_surface->getSurface()};
@@ -257,6 +288,12 @@ class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication
 		// We do a very simple thing, display an image and wait `DisplayImageMs` to show it
 		inline void workLoopBody() override
 		{
+			// Make the sampler persist in the workloopbody
+			#if defined(COMBINED_MUTABLE) || defined(SEPARATED_MUTABLE)
+			static auto defaultSampler = m_device->createSampler({
+					.AnisotropicFilter = 0
+				});
+			#endif
 			// load the image view
 			system::path filename, extension;
 			smart_refctd_ptr<ICPUImageView> cpuImgView;
@@ -390,13 +427,36 @@ class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication
 					info.desc = m_device->createImageView(std::move(viewParams));
 				}
 
+#if defined(COMBINED_IMMUTABLE) || defined(COMBINED_MUTABLE) || defined(SEPARATED_IMMUTABLE)
+				#if defined(COMBINED_MUTABLE)
+				info.info.image.sampler = defaultSampler;
+				#endif
 				const IGPUDescriptorSet::SWriteDescriptorSet writes[] = {{
 					.dstSet = ds,
 					.binding = 0,
 					.arrayElement = 0,
 					.count = 1,
 					.info = &info
 				}};
+#else
+				IGPUDescriptorSet::SDescriptorInfo samplerInfo = {};
+				samplerInfo.desc = defaultSampler;
+				samplerInfo.info.image.sampler = defaultSampler;
+				const IGPUDescriptorSet::SWriteDescriptorSet writes[] = { {
+					.dstSet = ds,
+					.binding = 0,
+					.arrayElement = 0,
+					.count = 1,
+					.info = &info
+				}, 
+				{
+					.dstSet = ds,
+					.binding = 1,
+					.arrayElement = 0,
+					.count = 1,
+					.info = &samplerInfo
+				}};
+#endif
 				m_device->updateDescriptorSets(writes,{});
 			}