buffer_cache: Fix CopyBuffers bug

Author: raphaelthegreat

src/video_core/amdgpu/liverpool.cpp

@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
-
+#pragma clang optimize off
 #include <boost/preprocessor/stringize.hpp>
 
 #include "common/assert.h"

src/video_core/buffer_cache/buffer_cache.cpp

@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
-
+#pragma clang optimize off
 #include <algorithm>
 #include <semaphore>
 #include "common/alignment.h"
@@ -288,13 +288,17 @@ void BufferCache::CopyBuffer(VAddr dst, VAddr src, u32 num_bytes, bool dst_gds,
         if (src_gds) {
             return gds_buffer;
         }
-        const auto [buffer, offset] = ObtainBuffer(src, num_bytes, false);
-        return *buffer;
+        // Avoid using ObtainBuffer here as that might give us the stream buffer.
+        const BufferId buffer_id = FindBuffer(src, num_bytes);
+        auto& buffer = slot_buffers[buffer_id];
+        SynchronizeBuffer(buffer, src, num_bytes, false);
+        return buffer;
     }();
     auto& dst_buffer = [&] -> const Buffer& {
         if (dst_gds) {
             return gds_buffer;
         }
+        // Prefer using ObtainBuffer here as that will auto-mark the region as GPU modified.
         const auto [buffer, offset] = ObtainBuffer(dst, num_bytes, true);
         return *buffer;
     }();

src/video_core/renderer_vulkan/vk_platform.cpp

@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
-
+#pragma clang optimize off
 // Include the vulkan platform specific header
 #if defined(ANDROID)
 #define VK_USE_PLATFORM_ANDROID_KHR
@@ -30,7 +30,9 @@ static const char* const CRASH_DIAGNOSTIC_LAYER_NAME = "VK_LAYER_LUNARG_crash_di
 static VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsCallback(
     vk::DebugUtilsMessageSeverityFlagBitsEXT severity, vk::DebugUtilsMessageTypeFlagsEXT type,
     const vk::DebugUtilsMessengerCallbackDataEXT* callback_data, void* user_data) {
-
+    if (std::string_view(callback_data->pMessage).contains("vkCmdCopyBuffer")) {
+        printf("bad\n");
+    }
     Common::Log::Level level{};
     switch (severity) {
     case vk::DebugUtilsMessageSeverityFlagBitsEXT::eError:

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
-
+#pragma clang optimize off
 #include "common/config.h"
 #include "common/debug.h"
 #include "core/memory.h"