Vulkan: Simplify palette texture conversion

1 files changed, 1 insertions, 20 deletions

diff --git a/Source/Core/VideoBackends/Vulkan/TextureCache.cpp b/Source/Core/VideoBackends/Vulkan/TextureCache.cpp
index 3bb92fa3c2..801a967630 100644
--- a/Source/Core/VideoBackends/Vulkan/TextureCache.cpp
+++ b/Source/Core/VideoBackends/Vulkan/TextureCache.cpp
@@ -86,28 +86,9 @@ void TextureCache::ConvertTexture(TCacheEntryBase* base_entry, TCacheEntryBase*
 {
   TCacheEntry* entry = static_cast<TCacheEntry*>(base_entry);
   TCacheEntry* unconverted = static_cast<TCacheEntry*>(base_unconverted);
-  _assert_(entry->config.rendertarget);
-
-  // EFB copies can be used as paletted textures as well. For these, we can't assume them to be
-  // contain the correct data before the frame begins (when the init command buffer is executed),
-  // so we must convert them at the appropriate time, during the drawing command buffer.
-  VkCommandBuffer command_buffer;
-  if (unconverted->IsEfbCopy())
-  {
-    command_buffer = g_command_buffer_mgr->GetCurrentCommandBuffer();
-    StateTracker::GetInstance()->EndRenderPass();
-    StateTracker::GetInstance()->SetPendingRebind();
-  }
-  else
-  {
-    // Use initialization command buffer and perform conversion before the drawing commands.
-    command_buffer = g_command_buffer_mgr->GetCurrentInitCommandBuffer();
-  }
 
   m_texture_converter->ConvertTexture(
-      command_buffer, GetRenderPassForTextureUpdate(entry->GetTexture()), entry->GetFramebuffer(),
-      unconverted->GetTexture(), entry->config.width, entry->config.height, palette, format,
-      unconverted->format);
+      entry, unconverted, GetRenderPassForTextureUpdate(entry->GetTexture()), palette, format);
 
   // Render pass transitions to SHADER_READ_ONLY.
   entry->GetTexture()->OverrideImageLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);