More fixes to descriptor heap scaffolding

- Add a way to specify mip index for an image descriptor (for pyramid)
- Upload static image descriptors to the descriptor heap with 1+ indexing
- Fix .pNext confusion in graphics pipeline creation

Author: zeux

src/niagara.cpp

@@ -161,7 +161,9 @@ void pushDescriptors(VkCommandBuffer commandBuffer, FrameDescriptors& framedesc,
 				{
 					const Image* image = static_cast<const Image*>(info.resource);
 					assert(image);
-					getDescriptor(framedesc.device, image->image, image->format, 0, VK_REMAINING_MIP_LEVELS, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
+					uint32_t mipLevel = (info.resourceMip < 0) ? 0 : uint32_t(info.resourceMip);
+					uint32_t levelCount = (info.resourceMip < 0) ? VK_REMAINING_MIP_LEVELS : 1;
+					getDescriptor(framedesc.device, image->image, image->format, mipLevel, levelCount, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
 					break;
 				}
 
@@ -296,6 +298,13 @@ DescriptorInfo::DescriptorInfo(const struct Image& image)
 	resource = &image;
 }
 
+DescriptorInfo::DescriptorInfo(const struct Image& image, VkImageView mipView, int mipIndex)
+    : DescriptorInfo(mipView)
+{
+	resource = &image;
+	resourceMip = mipIndex;
+}
+
 void errorCallback(int error_code, const char* description)
 {
 	fprintf(stderr, "GLFW ERROR (%d): %s\n", error_code, description);
@@ -849,6 +858,10 @@ int main(int argc, const char** argv)
 		write.pImageInfo = &imageInfo;
 
 		vkUpdateDescriptorSets(device, 1, &write, 0, nullptr);
+
+		if (descheapSupported)
+			getDescriptor(device, images[i].image, images[i].format, 0, VK_REMAINING_MIP_LEVELS, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
+			    static_cast<char*>(resourceHeap.data) + (1 + i) * resourceDescriptorSize, resourceDescriptorSize);
 	}
 
 	if (!sceneMode)
@@ -1559,11 +1572,12 @@ int main(int argc, const char** argv)
 
 			vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, depthreducePipeline);
 
+			DescriptorInfo mipSource = depthTarget;
+
 			for (uint32_t i = 0; i < depthPyramidLevels; ++i)
 			{
-				VkImageView sourceDepth = (i == 0) ? depthTarget.imageView : depthPyramidMips[i - 1];
-
-				DescriptorInfo descriptors[] = { depthPyramidMips[i], sourceDepth, depthSampler };
+				DescriptorInfo mipTarget(depthPyramid, depthPyramidMips[i], int(i));
+				DescriptorInfo descriptors[] = { mipTarget, mipSource, depthSampler };
 
 				uint32_t levelWidth = std::max(1u, depthPyramidWidth >> i);
 				uint32_t levelHeight = std::max(1u, depthPyramidHeight >> i);
@@ -1573,6 +1587,8 @@ int main(int argc, const char** argv)
 				dispatch(commandBuffer, framedesc, depthreduceProgram, levelWidth, levelHeight, reduceData, descriptors);
 
 				stageBarrier(commandBuffer, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
+
+				mipSource = mipTarget;
 			}
 
 			stageBarrier(commandBuffer, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);

src/resources.cpp

@@ -348,8 +348,6 @@ void getDescriptor(VkDevice device, VkDeviceAddress address, VkDeviceSize size,
 
 void getDescriptor(VkDevice device, VkFilter filter, VkSamplerMipmapMode mipmapMode, VkSamplerAddressMode addressMode, VkSamplerReductionModeEXT reductionMode, void* descriptor, size_t descriptorSize)
 {
-	VkSamplerReductionModeCreateInfoEXT createInfoReduction = { VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT };
-
 	VkSamplerCreateInfo createInfo = getSamplerInfo(filter, mipmapMode, addressMode);
 
 	VkSamplerReductionModeCreateInfoEXT reductionInfo = { VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT };

src/shaders.cpp

@@ -587,9 +587,10 @@ VkPipeline createGraphicsPipeline(VkDevice device, VkPipelineCache pipelineCache
 	std::vector<VkSpecializationMapEntry> specializationEntries;
 	VkSpecializationInfo specializationInfo = fillSpecializationInfo(specializationEntries, constants);
 
-	VkGraphicsPipelineCreateInfo createInfo = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO };
-
 	VkPipelineCreateFlags2CreateInfo extraFlags = { VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO };
+	extraFlags.pNext = &renderingInfo;
+
+	VkGraphicsPipelineCreateInfo createInfo = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO };
 	createInfo.pNext = &extraFlags;
 
 #if VK_EXT_descriptor_heap
@@ -677,7 +678,6 @@ VkPipeline createGraphicsPipeline(VkDevice device, VkPipelineCache pipelineCache
 	createInfo.pDynamicState = &dynamicState;
 
 	createInfo.layout = program.layout;
-	createInfo.pNext = &renderingInfo;
 
 	VkPipeline pipeline = 0;
 	VK_CHECK(vkCreateGraphicsPipelines(device, pipelineCache, 1, &createInfo, 0, &pipeline));

src/shaders.h

@@ -81,6 +81,7 @@ struct DescriptorInfo
 	};
 
 	const void* resource = NULL;
+	int resourceMip = -1;
 
 	DescriptorInfo()
 	{
@@ -114,4 +115,5 @@ struct DescriptorInfo
 
 	DescriptorInfo(const struct Buffer& buffer);
 	DescriptorInfo(const struct Image& image);
+	DescriptorInfo(const struct Image& image, VkImageView mipView, int mipIndex);
 };