From 1860a73d58b8bbb265eef8acdd4cf8dcfa0a0ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 12 Mar 2023 23:14:20 +0100
Subject: [PATCH] Address feedback from previous PR

---
 Common/Thread/ParallelLoop.cpp    | 6 +++---
 GPU/Common/ReplacedTexture.cpp    | 3 +--
 GPU/Common/TextureCacheCommon.cpp | 4 ++--
 GPU/Vulkan/TextureCacheVulkan.cpp | 3 ---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Common/Thread/ParallelLoop.cpp b/Common/Thread/ParallelLoop.cpp
index 18ec756e4e..2b5f8b0606 100644
--- a/Common/Thread/ParallelLoop.cpp
+++ b/Common/Thread/ParallelLoop.cpp
@@ -111,8 +111,8 @@ void ParallelRangeLoop(ThreadManager *threadMan, const std::function<void(int, i
 
 // NOTE: Supports a max of 2GB.
 void ParallelMemcpy(ThreadManager *threadMan, void *dst, const void *src, size_t bytes, TaskPriority priority) {
-	// This threshold can probably be a lot bigger.
-	if (bytes < 512) {
+	// This threshold should be the same as the minimum split below, 128kb.
+	if (bytes < 128 * 1024) {
 		memcpy(dst, src, bytes);
 		return;
 	}
@@ -129,7 +129,7 @@ void ParallelMemcpy(ThreadManager *threadMan, void *dst, const void *src, size_t
 // NOTE: Supports a max of 2GB.
 void ParallelMemset(ThreadManager *threadMan, void *dst, uint8_t value, size_t bytes, TaskPriority priority) {
 	// This threshold can probably be a lot bigger.
-	if (bytes < 512) {
+	if (bytes < 128 * 1024) {
 		memset(dst, 0, bytes);
 		return;
 	}
diff --git a/GPU/Common/ReplacedTexture.cpp b/GPU/Common/ReplacedTexture.cpp
index 3cd62638af..38ca332cc5 100644
--- a/GPU/Common/ReplacedTexture.cpp
+++ b/GPU/Common/ReplacedTexture.cpp
@@ -561,8 +561,7 @@ bool ReplacedTexture::CopyLevelTo(int level, void *out, int rowPitch) {
 		}
 	} else {
 		// TODO: Add sanity checks here for other formats?
-		// Just gonna do a memcpy, slightly scared of the parallel ones.
-		memcpy(out, data.data(), data.size());
+		ParallelMemcpy(&g_threadManager, out, data.data(), data.size());
 	}
 
 	return true;
diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp
index 9410fdb813..778c4319fb 100644
--- a/GPU/Common/TextureCacheCommon.cpp
+++ b/GPU/Common/TextureCacheCommon.cpp
@@ -1551,8 +1551,8 @@ ReplacedTexture *TextureCacheCommon::FindReplacement(TexCacheEntry *entry, int &
 		// Make sure we keep polling.
 		entry->status |= TexCacheEntry::STATUS_TO_REPLACE;
 		break;
-    default:
-        break;
+	default:
+		break;
 	}
 	replacementTimeThisFrame_ += time_now_d() - replaceStart;
 	return replaced;
diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp
index 6417bb8491..e18fd7c5d5 100644
--- a/GPU/Vulkan/TextureCacheVulkan.cpp
+++ b/GPU/Vulkan/TextureCacheVulkan.cpp
@@ -455,9 +455,6 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) {
 		Draw::DataFormat fmt = plan.replaced->Format();
 		bcFormat = Draw::DataFormatIsBlockCompressed(fmt, &bcAlign);
 		actualFmt = ToVulkanFormat(fmt);
-		if (actualFmt != VULKAN_8888_FORMAT) {
-			actualFmt = actualFmt;
-		}
 	}
 
 	bool computeUpload = false;