Wire up some missing calls for pushdescriptors

Author: perim

scripts/vkconfig.py

@@ -135,14 +135,14 @@ def validate_funcs(lst):
 validate_funcs(replay_post_calls)
 replay_postprocess_calls = [ 'vkCmdPushConstants', 'vkCmdPushConstants2KHR', 'vkCreateRayTracingPipelinesKHR', 'vkCreateGraphicsPipelines',
 	'vkCreateComputePipelines', 'vkCmdBindPipeline', 'vkQueueSubmit', 'vkQueueSubmit2', 'vkQueueSubmit2KHR', 'vkCmdBindDescriptorSets2KHR',
-	'vkCmdBindDescriptorSets', 'vkCmdBindDescriptorSets2' ]
+	'vkCmdBindDescriptorSets', 'vkCmdBindDescriptorSets2', 'vkCmdPushDescriptorSet2KHR', 'vkCmdPushDescriptorSet2', 'vkCmdPushDescriptorSetKHR' ]
 validate_funcs(replay_postprocess_calls)
 trace_pre_calls = [ 'vkQueueSubmit', 'vkCreateInstance', 'vkCreateDevice', 'vkFreeMemory', 'vkQueueSubmit2', 'vkQueueSubmit2KHR' ]
 validate_funcs(trace_pre_calls)
 trace_post_calls = [ 'vkCreateInstance', 'vkCreateDevice', 'vkDestroyInstance', 'vkGetPhysicalDeviceFeatures', 'vkGetPhysicalDeviceProperties',
 		'vkGetPhysicalDeviceSurfaceCapabilitiesKHR', 'vkBindImageMemory', 'vkBindBufferMemory', 'vkBindImageMemory2', 'vkBindImageMemory2KHR',
 		'vkBindBufferMemory2', 'vkUpdateDescriptorSets', 'vkFlushMappedMemoryRanges', 'vkQueuePresentKHR', 'vkMapMemory2KHR', 'vkMapMemory2',
-		'vkMapMemory', 'vkCmdBindDescriptorSets', 'vkBindBufferMemory2KHR', 'vkCmdPushDescriptorSet2KHR',
+		'vkMapMemory', 'vkCmdBindDescriptorSets', 'vkBindBufferMemory2KHR', 'vkCmdPushDescriptorSet2KHR', 'vkCmdPushDescriptorSet2',
 		'vkGetImageMemoryRequirements', 'vkGetPipelineCacheData', 'vkAcquireNextImageKHR', 'vkAcquireNextImage2KHR',
 		'vkGetBufferMemoryRequirements', 'vkGetBufferMemoryRequirements2', 'vkGetImageMemoryRequirements2', 'vkGetPhysicalDeviceMemoryProperties',
 		'vkGetPhysicalDeviceFormatProperties', 'vkGetPhysicalDeviceFormatProperties2', 'vkCmdPushDescriptorSetKHR', 'vkCreateSwapchainKHR',

src/execute_commands.cpp

@@ -145,6 +145,9 @@ static bool execute_commands(lava_file_reader& reader, VkCommandBuffer commandBu
 			else if (c.data.bind_pipeline.pipelineBindPoint == VK_PIPELINE_BIND_POINT_COMPUTE) compute_pipeline_bound = c.data.bind_pipeline.pipeline_index;
 			else if (c.data.bind_pipeline.pipelineBindPoint == VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR) raytracing_pipeline_bound = c.data.bind_pipeline.pipeline_index;
 			break;
+		case VKCMDPUSHDESCRIPTORSETKHR:
+			assert(false); // TBD
+			break;
 		case VKCMDDISPATCH: // proxy for all compute commands
 			{
 				const auto& pipeline_data = VkPipeline_index.at(compute_pipeline_bound);

src/hardcode_read.cpp

@@ -1330,18 +1330,51 @@ static void handle_VkCopyDescriptorSets(lava_file_reader& reader, uint32_t descr
 
 void replay_postprocess_vkCmdPushDescriptorSetKHR(lava_file_reader& reader, VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites)
 {
-	assert(false);
-	//trackedcommand cmd { VKCMDPUSHDESCRIPTORSETKHR };
-	// TBD - need to delay
-	// handle_VkWriteDescriptorSets(writer, descriptorWriteCount, pDescriptorWrites, false);
+	const uint32_t cmdbuffer_index = index_to_VkCommandBuffer.index(commandBuffer);
+	auto& cmdbuffer_data = VkCommandBuffer_index.at(cmdbuffer_index);
+	trackedcommand cmd { VKCMDPUSHDESCRIPTORSETKHR };
+	cmd.data.push_descriptorset.pipelineBindPoint = pipelineBindPoint;
+	cmd.data.push_descriptorset.layout = layout;
+	cmd.data.push_descriptorset.set = set;
+	// TBD handle pDescriptorWrites here
+	cmdbuffer_data.commands.push_back(cmd);
 }
 
 void replay_postprocess_vkCmdPushDescriptorSet2KHR(lava_file_reader& reader, VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo)
 {
-	assert(false);
-	//trackedcommand cmd { VKCMDPUSHDESCRIPTORSET2KHR };
-	// TBD - need to delay
-	//handle_VkWriteDescriptorSets(writer, pPushDescriptorSetInfo->descriptorWriteCount, pPushDescriptorSetInfo->pDescriptorWrites, false);
+	const uint32_t cmdbuffer_index = index_to_VkCommandBuffer.index(commandBuffer);
+	auto& cmdbuffer_data = VkCommandBuffer_index.at(cmdbuffer_index);
+
+	// "If stageFlags specifies a subset of all stages corresponding to one or more pipeline bind points, the binding operation still affects all stages corresponding to
+	// the given pipeline bind point(s) as if the equivalent original version of this command had been called with the same parameters. For example, specifying a
+	// stageFlags value of VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT | VK_SHADER_STAGE_COMPUTE_BIT is equivalent to calling the original version of this
+	// command once with VK_PIPELINE_BIND_POINT_GRAPHICS and once with VK_PIPELINE_BIND_POINT_COMPUTE."
+
+	if (pPushDescriptorSetInfo->stageFlags & (VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT))
+	{
+		trackedcommand cmd { VKCMDPUSHDESCRIPTORSETKHR };
+		cmd.data.push_descriptorset.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+		cmd.data.push_descriptorset.layout = pPushDescriptorSetInfo->layout;
+		cmd.data.push_descriptorset.set = pPushDescriptorSetInfo->set;
+		cmd.data.push_descriptorset.descriptorWriteCount = pPushDescriptorSetInfo->descriptorWriteCount;
+		// TBD handle pDescriptorWrites here
+		cmdbuffer_data.commands.push_back(cmd);
+	}
+	if (pPushDescriptorSetInfo->stageFlags & VK_SHADER_STAGE_COMPUTE_BIT)
+	{
+		trackedcommand cmd { VKCMDPUSHDESCRIPTORSETKHR };
+		cmd.data.push_descriptorset.pipelineBindPoint = VK_PIPELINE_BIND_POINT_COMPUTE;
+		cmd.data.push_descriptorset.layout = pPushDescriptorSetInfo->layout;
+		cmd.data.push_descriptorset.set = pPushDescriptorSetInfo->set;
+		cmd.data.push_descriptorset.descriptorWriteCount = pPushDescriptorSetInfo->descriptorWriteCount;
+		// TBD handle pDescriptorWrites here
+		cmdbuffer_data.commands.push_back(cmd);
+	}
+}
+
+void replay_postprocess_vkCmdPushDescriptorSet2(lava_file_reader& reader, VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo* pPushDescriptorSetInfo)
+{
+	replay_postprocess_vkCmdPushDescriptorSet2KHR(reader, commandBuffer, pPushDescriptorSetInfo);
 }
 
 void replay_postprocess_vkUpdateDescriptorSets(lava_file_reader& reader, VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)

src/hardcode_write.cpp

@@ -672,6 +672,11 @@ static void trace_post_vkCmdPushDescriptorSet2KHR(lava_file_writer& writer, VkCo
 	handle_VkWriteDescriptorSets(writer, pPushDescriptorSetInfo->descriptorWriteCount, pPushDescriptorSetInfo->pDescriptorWrites, false, true);
 }
 
+static void trace_post_vkCmdPushDescriptorSet2(lava_file_writer& writer, VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo* pPushDescriptorSetInfo)
+{
+	handle_VkWriteDescriptorSets(writer, pPushDescriptorSetInfo->descriptorWriteCount, pPushDescriptorSetInfo->pDescriptorWrites, false, true);
+}
+
 static void trace_post_vkUpdateDescriptorSets(lava_file_writer& writer, VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
 	handle_VkWriteDescriptorSets(writer, descriptorWriteCount, pDescriptorWrites, true, false);

src/lavatube.h

@@ -512,6 +512,14 @@ struct trackedcommand // does _not_ inherit trackable
 			uint32_t dynamicOffsetCount;
 			uint32_t* pDynamicOffsets;
 		} bind_descriptorsets;
+		struct push_descriptorset
+		{
+			VkPipelineBindPoint pipelineBindPoint;
+			VkPipelineLayout layout;
+			uint32_t set;
+			uint32_t descriptorWriteCount;
+			// TBD pDescriptorWrites copy here
+		} push_descriptorset;
 		struct bind_pipeline
 		{
 			VkPipelineBindPoint pipelineBindPoint;