vk: Reuse discarded memory whenever possible instead of recreating new

objects - Memory allocations are surprisingly expensive when spammed
RPCS3 · Jul 2, 2019 · 3857ae5 · 3857ae5
1 parent 54ce5a2
commit 3857ae5
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 88 deletions.
diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.cpp b/rpcs3/Emu/RSX/Common/TextureUtils.cpp
@@ -796,3 +796,17 @@ size_t get_texture_size(const rsx::vertex_texture &texture)
 	return get_texture_size(texture.format(), texture.width(), texture.height(), texture.depth(),
 		texture.pitch(), texture.get_exact_mipmap_count(), texture.cubemap() ? 6 : 1);
 }
+
+u32 get_remap_encoding(const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap)
+{
+	u32 encode = 0;
+	encode |= (remap.first[0] << 0);
+	encode |= (remap.first[1] << 2);
+	encode |= (remap.first[2] << 4);
+	encode |= (remap.first[3] << 6);
+	encode |= (remap.second[0] << 8);
+	encode |= (remap.second[1] << 10);
+	encode |= (remap.second[2] << 12);
+	encode |= (remap.second[3] << 14);
+	return encode;
+}
diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.h b/rpcs3/Emu/RSX/Common/TextureUtils.h
@@ -139,3 +139,8 @@ size_t get_texture_size(const rsx::vertex_texture &texture);
 * Get packed pitch
 */
 u32 get_format_packed_pitch(u32 format, u16 width);
+
+/**
+* Reverse encoding
+*/
+u32 get_remap_encoding(const std::pair<std::array<u8, 4>, std::array<u8, 4>>& remap);
diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h
@@ -1298,11 +1298,19 @@ namespace vk
 				}
 			}
 
-			VkComponentMapping real_mapping = vk::apply_swizzle_remap
-			(
-				{native_component_map.a, native_component_map.r, native_component_map.g, native_component_map.b },
-				remap
-			);
+			VkComponentMapping real_mapping;
+			if (remap_encoding == 0xAAE4)
+			{
+				real_mapping = native_component_map;
+			}
+			else
+			{
+				real_mapping = vk::apply_swizzle_remap
+				(
+					{ native_component_map.a, native_component_map.r, native_component_map.g, native_component_map.b },
+					remap
+				);
+			}
 
 			const auto range = vk::get_image_subresource_range(0, 0, info.arrayLayers, info.mipLevels, aspect() & mask);
 

diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/Emu/RSX/VK/VKOverlays.h
@@ -138,7 +138,7 @@ namespace vk
 			return fs_inputs;
 		}
 
-		virtual void get_dynamic_state_entries(VkDynamicState* state_descriptors, VkPipelineDynamicStateCreateInfo& info)
+		virtual void get_dynamic_state_entries(VkDynamicState* /*state_descriptors*/, VkPipelineDynamicStateCreateInfo& /*info*/)
 		{}
 
 		virtual std::vector<VkPushConstantRange> get_push_constants()