Day 32: Final descriptor cleanup

Replace the remaining combined image/sampler objects with separate ones;
after the texelFetch cleanup this just involved a couple of stragglers.
DescriptorInfo ctor from image+sampler is now redundant. Also, similarly
to what we did on stream, remove .buffer from the DescriptorInfo calls
so that the descriptor infos track the original resource.

This was done after the stream.

Author: zeux

src/niagara.cpp

@@ -144,7 +144,7 @@ void pushDescriptors(VkCommandBuffer commandBuffer, FrameDescriptors& framedesc,
 
 				const Image* image = static_cast<const Image*>(info.resource);
 				char descriptor[128];
-				getDescriptor(framedesc.device, image->image, image->format, 0, 1, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
+				getDescriptor(framedesc.device, image->image, image->format, 0, VK_REMAINING_MIP_LEVELS, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
 
 				memcpy(static_cast<char*>(framedesc.descriptorHeap) + (framedesc.descriptorOffset + i) * framedesc.descriptorSize, descriptor, framedesc.descriptorSize);
 			}
@@ -1370,8 +1370,7 @@ int main(int argc, const char** argv)
 
 				vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline);
 
-				DescriptorInfo pyramidDesc(depthSampler, depthPyramid.imageView);
-				DescriptorInfo descriptors[] = { db.buffer, mb.buffer, dcb.buffer, dccb.buffer, dvb.buffer, pyramidDesc };
+				DescriptorInfo descriptors[] = { db, mb, dcb, dccb, dvb, depthPyramid, depthSampler };
 
 				dispatch(commandBuffer, framedesc, drawcullProgram, uint32_t(draws.size()), 1, passData, descriptors);
 			}
@@ -1382,7 +1381,7 @@ int main(int argc, const char** argv)
 
 				vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, tasksubmitPipeline);
 
-				DescriptorInfo descriptors[] = { dccb.buffer, dcb.buffer };
+				DescriptorInfo descriptors[] = { dccb, dcb };
 				pushDescriptors(commandBuffer, framedesc, tasksubmitProgram, descriptors);
 
 				vkCmdDispatch(commandBuffer, 1, 1, 1);
@@ -1409,8 +1408,7 @@ int main(int argc, const char** argv)
 
 				vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, late ? clusterculllatePipeline : clustercullPipeline);
 
-				DescriptorInfo pyramidDesc(depthSampler, depthPyramid.imageView);
-				DescriptorInfo descriptors[] = { dcb.buffer, db.buffer, mlb.buffer, mvb.buffer, pyramidDesc, cib.buffer, ccb.buffer };
+				DescriptorInfo descriptors[] = { dcb, db, mlb, mvb, depthPyramid, cib, ccb, depthSampler };
 				pushDescriptors(commandBuffer, framedesc, clustercullProgram, descriptors);
 
 				CullData passData = cullData;
@@ -1423,7 +1421,7 @@ int main(int argc, const char** argv)
 
 				vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, clustersubmitPipeline);
 
-				DescriptorInfo descriptors2[] = { ccb.buffer, cib.buffer };
+				DescriptorInfo descriptors2[] = { ccb, cib };
 				pushDescriptors(commandBuffer, framedesc, clustersubmitProgram, descriptors2);
 
 				vkCmdDispatch(commandBuffer, 1, 1, 1);
@@ -1475,7 +1473,7 @@ int main(int argc, const char** argv)
 			{
 				vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, postPass >= 1 ? clusterpostPipeline : clusterPipeline);
 
-				DescriptorInfo descriptors[] = { dcb.buffer, db.buffer, mlb.buffer, mdb.buffer, vb.buffer, cib.buffer, DescriptorInfo(), textureSampler, mtb.buffer };
+				DescriptorInfo descriptors[] = { dcb, db, mlb, mdb, vb, cib, DescriptorInfo(), textureSampler, mtb };
 				pushDescriptors(commandBuffer, framedesc, clusterProgram, descriptors);
 
 				vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, clusterProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
@@ -1488,8 +1486,7 @@ int main(int argc, const char** argv)
 				vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, postPass >= 1 ? meshtaskpostPipeline : late ? meshtasklatePipeline
 				                                                                                                              : meshtaskPipeline);
 
-				DescriptorInfo pyramidDesc(depthSampler, depthPyramid.imageView);
-				DescriptorInfo descriptors[] = { dcb.buffer, db.buffer, mlb.buffer, mdb.buffer, vb.buffer, mvb.buffer, pyramidDesc, textureSampler, mtb.buffer };
+				DescriptorInfo descriptors[] = { dcb, db, mlb, mdb, vb, mvb, depthPyramid, textureSampler, mtb, depthSampler };
 				pushDescriptors(commandBuffer, framedesc, meshtaskProgram, descriptors);
 
 				vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, meshtaskProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
@@ -1501,7 +1498,7 @@ int main(int argc, const char** argv)
 			{
 				vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, postPass >= 1 ? meshpostPipeline : meshPipeline);
 
-				DescriptorInfo descriptors[] = { dcb.buffer, db.buffer, vb.buffer, DescriptorInfo(), DescriptorInfo(), DescriptorInfo(), DescriptorInfo(), textureSampler, mtb.buffer };
+				DescriptorInfo descriptors[] = { dcb, db, vb, DescriptorInfo(), DescriptorInfo(), DescriptorInfo(), DescriptorInfo(), textureSampler, mtb };
 				pushDescriptors(commandBuffer, framedesc, meshProgram, descriptors);
 
 				vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, meshProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
@@ -1529,11 +1526,9 @@ int main(int argc, const char** argv)
 
 			for (uint32_t i = 0; i < depthPyramidLevels; ++i)
 			{
-				DescriptorInfo sourceDepth = (i == 0)
-				                                 ? DescriptorInfo(depthSampler, depthTarget.imageView)
-				                                 : DescriptorInfo(depthSampler, depthPyramidMips[i - 1]);
+				VkImageView sourceDepth = (i == 0) ? depthTarget.imageView : depthPyramidMips[i - 1];
 
-				DescriptorInfo descriptors[] = { depthPyramidMips[i], sourceDepth };
+				DescriptorInfo descriptors[] = { depthPyramidMips[i], sourceDepth, depthSampler };
 
 				uint32_t levelWidth = std::max(1u, depthPyramidWidth >> i);
 				uint32_t levelHeight = std::max(1u, depthPyramidHeight >> i);

src/shaders.h

@@ -91,11 +91,11 @@ struct DescriptorInfo
 		accelerationStructure = structure;
 	}
 
-	DescriptorInfo(VkImageView imageView, VkImageLayout imageLayout = VK_IMAGE_LAYOUT_GENERAL)
+	DescriptorInfo(VkImageView imageView)
 	{
 		image.sampler = VK_NULL_HANDLE;
 		image.imageView = imageView;
-		image.imageLayout = imageLayout;
+		image.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
 	}
 
 	DescriptorInfo(VkSampler sampler)
@@ -105,13 +105,6 @@ struct DescriptorInfo
 		image.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 	}
 
-	DescriptorInfo(VkSampler sampler, VkImageView imageView, VkImageLayout imageLayout = VK_IMAGE_LAYOUT_GENERAL)
-	{
-		image.sampler = sampler;
-		image.imageView = imageView;
-		image.imageLayout = imageLayout;
-	}
-
 	DescriptorInfo(VkBuffer buffer_)
 	{
 		buffer.buffer = buffer_;

src/shaders/clustercull.comp.glsl

@@ -39,7 +39,7 @@ layout(binding = 3) buffer MeshletVisibility
 	uint meshletVisibility[];
 };
 
-layout(binding = 4) uniform sampler2D depthPyramid;
+layout(binding = 4) uniform texture2D depthPyramid;
 
 layout(binding = 5) writeonly buffer ClusterIndices
 {
@@ -51,6 +51,8 @@ layout(binding = 6) buffer ClusterCount
 	uint clusterCount;
 };
 
+layout(binding = 7) uniform sampler depthSampler;
+
 void main()
 {
 	// we convert 2D index to 1D index using a fixed *64 factor, see tasksubmit.comp.glsl
@@ -116,7 +118,7 @@ void main()
 			float level = floor(log2(max(width, height)));
 
 			// Sampler is set up to do min reduction, so this computes the minimum depth of a 2x2 texel quad
-			float depth = textureLod(depthPyramid, (aabb.xy + aabb.zw) * 0.5, level).x;
+			float depth = textureLod(sampler2D(depthPyramid, depthSampler), (aabb.xy + aabb.zw) * 0.5, level).x;
 			float depthSphere = cullData.znear / (center.z - radius);
 
 			visible = visible && depthSphere > depth;

src/shaders/depthreduce.comp.glsl

@@ -3,7 +3,8 @@
 layout(local_size_x = 32, local_size_y = 32, local_size_z = 1) in;
 
 layout(binding = 0, r32f) uniform writeonly image2D outImage;
-layout(binding = 1) uniform sampler2D inImage;
+layout(binding = 1) uniform texture2D inImage;
+layout(binding = 2) uniform sampler depthSampler;
 
 layout(push_constant) uniform block
 {
@@ -15,7 +16,7 @@ void main()
 	uvec2 pos = gl_GlobalInvocationID.xy;
 
 	// Sampler is set up to do min reduction, so this computes the minimum depth of a 2x2 texel quad
-	float depth = texture(inImage, (vec2(pos) + vec2(0.5)) / imageSize).x;
+	float depth = texture(sampler2D(inImage, depthSampler), (vec2(pos) + vec2(0.5)) / imageSize).x;
 
 	imageStore(outImage, ivec2(pos), vec4(depth));
 }

src/shaders/drawcull.comp.glsl

@@ -48,7 +48,8 @@ layout(binding = 4) buffer DrawVisibility
 	uint drawVisibility[];
 };
 
-layout(binding = 5) uniform sampler2D depthPyramid;
+layout(binding = 5) uniform texture2D depthPyramid;
+layout(binding = 6) uniform sampler depthSampler;
 
 void main()
 {
@@ -96,7 +97,7 @@ void main()
 			float level = ceil(log2(max(width, height)));
 
 			// Sampler is set up to do min reduction, so this computes the minimum depth of a 2x2 texel quad
-			float depth = textureLod(depthPyramid, (aabb.xy + aabb.zw) * 0.5, level).x;
+			float depth = textureLod(sampler2D(depthPyramid, depthSampler), (aabb.xy + aabb.zw) * 0.5, level).x;
 			float depthSphere = cullData.znear / (center.z - radius);
 
 			visible = visible && depthSphere > depth;

src/shaders/meshlet.task.glsl

@@ -40,7 +40,9 @@ layout(binding = 5) buffer MeshletVisibility
 	uint meshletVisibility[];
 };
 
-layout(binding = 6) uniform sampler2D depthPyramid;
+layout(binding = 6) uniform texture2D depthPyramid;
+
+layout(binding = 9) uniform sampler depthSampler;
 
 taskPayloadSharedEXT MeshTaskPayload payload;
 
@@ -118,7 +120,7 @@ void main()
 			float level = floor(log2(max(width, height)));
 
 			// Sampler is set up to do min reduction, so this computes the minimum depth of a 2x2 texel quad
-			float depth = textureLod(depthPyramid, (aabb.xy + aabb.zw) * 0.5, level).x;
+			float depth = textureLod(sampler2D(depthPyramid, depthSampler), (aabb.xy + aabb.zw) * 0.5, level).x;
 			float depthSphere = cullData.znear / (center.z - radius);
 
 			visible = visible && depthSphere > depth;