vk: Fix descriptor set update and caching model to support skipped updates

rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp

@@ -364,7 +364,7 @@ namespace vk
 					break;
 				}
 
-				set.next_descriptor_set(); // Initializes the set layout and allocates first set
+				set.create_descriptor_set_layout();
 				set_layouts.push_back(set.m_descriptor_set_layout);
 
 				for (const auto& input : set.m_inputs[input_type_push_constant])
@@ -402,8 +402,7 @@ namespace vk
 					continue;
 				}
 
-				bind_sets[count++] = set.m_descriptor_set.value();   // Current set pointer for binding
+				bind_sets[count++] = set.commit();   // Commit variable changes and return handle to the new set
-				set.on_bind();                                       // Notify bind event. Internally updates handles and triggers flushing.
 			}
 
 			vkCmdBindPipeline(cmd, bind_point, m_pipeline);
@@ -418,10 +417,17 @@ namespace vk
 				return;
 			}
 
-			vkDestroyDescriptorSetLayout(m_device, m_descriptor_set_layout, nullptr);
+			if (m_descriptor_set_layout)
-			m_descriptor_pool->destroy();
+			{
+				vkDestroyDescriptorSetLayout(m_device, m_descriptor_set_layout, nullptr);
+			}
+
+			if (m_descriptor_pool)
+			{
+				m_descriptor_pool->destroy();
+				m_descriptor_pool.reset();
+			}
 
-			m_descriptor_pool.reset();
 			m_device = VK_NULL_HANDLE;
 		}
 
@@ -451,26 +457,24 @@ namespace vk
 		{
 			if (!m_descriptor_pool)
 			{
-				create_descriptor_set_layout();
 				create_descriptor_pool();
 			}
 
 			return m_descriptor_pool->allocate(m_descriptor_set_layout);
 		}
 
-		void descriptor_table_t::next_descriptor_set()
+		VkDescriptorSet descriptor_table_t::commit()
 		{
 			if (!m_descriptor_set)
 			{
-				m_descriptor_set = allocate_descriptor_set();
+				m_any_descriptors_dirty = true;
 				std::fill(m_descriptors_dirty.begin(), m_descriptors_dirty.end(), false);
-				return;
 			}
 
 			// Check if we need to actually open a new set
 			if (!m_any_descriptors_dirty)
 			{
-				return;
+				return m_descriptor_set.value();
 			}
 
 			auto push_descriptor_slot = [this](unsigned idx)
@@ -500,6 +504,7 @@ namespace vk
 
 			m_copy_cmds.clear();
 			rsx::flags32_t type_mask = 0u;
+			m_descriptor_set = allocate_descriptor_set();
 
 			for (unsigned i = 0; i < m_descriptor_slots.size(); ++i)
 			{
@@ -526,8 +531,10 @@ namespace vk
 			}
 
 			m_descriptor_set.push(m_copy_cmds, type_mask); // Write previous state
-			m_descriptor_set = allocate_descriptor_set();
+			m_descriptor_set.on_bind();
 			m_any_descriptors_dirty = false;
+
+			return m_descriptor_set.value();
 		}
 
 		void descriptor_table_t::create_descriptor_set_layout()

rpcs3/Emu/RSX/VK/VKProgramPipeline.h

@@ -136,13 +136,7 @@ namespace vk
 			void create_descriptor_pool();
 
 			VkDescriptorSet allocate_descriptor_set();
-			void next_descriptor_set();
+			VkDescriptorSet commit();
-
-			inline void on_bind()
-			{
-				next_descriptor_set();       // Enqueue changes and update pointers
-				m_descriptor_set.on_bind();  // Notify async queue to flush any pending changes
-			}
 
 			template <typename T>
 			inline void notify_descriptor_slot_updated(u32 slot, const T& data)

rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp

@@ -411,14 +411,10 @@ namespace vk
 		if (m_pending_copies.empty()) [[likely]]
 		{
 			m_pending_copies = std::move(copy_cmd);
+			return;
 		}
-		else
+
-		{
+		m_pending_copies += copy_cmd;
-			const auto old_size = m_pending_copies.size();
-			const auto new_size = copy_cmd.size() + old_size;
-			m_pending_copies.resize(new_size);
-			std::copy(copy_cmd.begin(), copy_cmd.end(), m_pending_copies.begin() + old_size);
-		}
 	}
 
 	void descriptor_set::push(rsx::simple_array<VkWriteDescriptorSet>& write_cmds, u32 type_mask)
@@ -429,15 +425,10 @@ namespace vk
 		if (m_pending_writes.empty()) [[unlikely]]
 		{
 			m_pending_writes = std::move(write_cmds);
+			return;
 		}
-		else
 #endif
-		{
+		m_pending_writes += write_cmds;
-			const auto old_size = m_pending_writes.size();
-			const auto new_size = write_cmds.size() + old_size;
-			m_pending_writes.resize(new_size);
-			std::copy(write_cmds.begin(), write_cmds.end(), m_pending_writes.begin() + old_size);
-		}
 	}
 
 	void descriptor_set::push(const descriptor_set_dynamic_offset_t& offset)