Revert "HACK: Avoid swizzling and reuploading ASTC image every frame"

This reverts commit b18c1fb1bbbcc235e9a1cbbb2704fed2e5895e61.

2 files changed, 1 insertions, 10 deletions

diff --git a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
index 27328dab2..ce92f66ab 100644
--- a/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
+++ b/src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp
@@ -214,7 +214,6 @@ StagingBufferPool::StagingBuffersCache& StagingBufferPool::GetCache(MemoryUsage
 }
 
 void StagingBufferPool::ReleaseCache(MemoryUsage usage) {
-    return;
     ReleaseLevel(GetCache(usage), current_delete_level);
 }
 
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index 51be57b19..b3e17c332 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -846,15 +846,7 @@ void TextureCacheRuntime::Finish() {
 }
 
 StagingBufferRef TextureCacheRuntime::UploadStagingBuffer(size_t size) {
-    static StagingBufferRef result;
-    static size_t last_size = 0;
-    if (size == last_size) {
-        return result;
-    }
-    LOG_ERROR(Debug, "Called");
-    last_size = size;
-    result = staging_buffer_pool.Request(size, MemoryUsage::Upload);
-    return result;
+    return staging_buffer_pool.Request(size, MemoryUsage::Upload);
 }
 
 StagingBufferRef TextureCacheRuntime::DownloadStagingBuffer(size_t size, bool deferred) {