Dirty-track the current pipeline to avoid many vkBindPipeline calls.

hrydgard · Aug 14, 2017 · a1fd2d1 · a1fd2d1
1 parent 5a65334
commit a1fd2d1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp
@@ -569,6 +569,12 @@ void DrawEngineVulkan::DoFlush() {
 	gpuStats.numFlushes++;
 
 	VkCommandBuffer cmd = (VkCommandBuffer)draw_->GetNativeObject(Draw::NativeObject::RENDERPASS_COMMANDBUFFER);
+	if (cmd != lastCmd_) {
+		lastPipeline_ = nullptr;
+		lastCmd_ = cmd;
+		gstate_c.Dirty(DIRTY_VIEWPORTSCISSOR_STATE);
+	}
+
 	VkRenderPass rp = (VkRenderPass)draw_->GetNativeObject(Draw::NativeObject::CURRENT_RENDERPASS);
 	if (!rp)
 		Crash();
@@ -660,7 +666,10 @@ void DrawEngineVulkan::DoFlush() {
 			// Already logged, let's bail out.
 			return;
 		}
-		vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline->pipeline);  // TODO: Avoid if same as last draw.
+		if (pipeline != lastPipeline_) {
+			vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline->pipeline);  // TODO: Avoid if same as last draw.
+			lastPipeline_ = pipeline;
+		}
 
 		UpdateUBOs(frame);
 

diff --git a/GPU/Vulkan/DrawEngineVulkan.h b/GPU/Vulkan/DrawEngineVulkan.h
@@ -60,6 +60,7 @@ typedef u32 ReliableHashType;
 
 class VulkanContext;
 class VulkanPushBuffer;
+struct VulkanPipeline;
 
 struct DrawEngineVulkanStats {
 	int pushUBOSpaceUsed;
@@ -146,6 +147,8 @@ class DrawEngineVulkan : public DrawEngineCommon {
 	// We use a single descriptor set layout for all PSP draws.
 	VkDescriptorSetLayout descriptorSetLayout_;
 	VkPipelineLayout pipelineLayout_;
+	VkCommandBuffer lastCmd_ = VK_NULL_HANDLE;
+	VulkanPipeline *lastPipeline_;
 
 	struct DescriptorSetKey {
 		VkImageView imageView_;