From bf1660869ea14ba6ac8857abf7948a96f186a2ee Mon Sep 17 00:00:00 2001
From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com>
Date: Sun, 22 Sep 2024 01:40:25 +0300
Subject: [PATCH] more fixes

---
 src/shader_recompiler/backend/spirv/emit_spirv_image.cpp | 1 +
 src/video_core/buffer_cache/buffer_cache.cpp             | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
index 03cfbdcb..50d9cc8c 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
@@ -181,6 +181,7 @@ Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, u32 handle, Id lod
     case AmdGpu::ImageType::Color1DArray:
     case AmdGpu::ImageType::Color2D:
     case AmdGpu::ImageType::Cube:
+    case AmdGpu::ImageType::Color2DMsaa:
         return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[2]), zero, mips());
     case AmdGpu::ImageType::Color2DArray:
     case AmdGpu::ImageType::Color3D:
diff --git a/src/video_core/buffer_cache/buffer_cache.cpp b/src/video_core/buffer_cache/buffer_cache.cpp
index 5335f21f..8cbc3b94 100644
--- a/src/video_core/buffer_cache/buffer_cache.cpp
+++ b/src/video_core/buffer_cache/buffer_cache.cpp
@@ -584,15 +584,13 @@ bool BufferCache::SynchronizeBufferFromImage(Buffer& buffer, VAddr device_addr,
     if (False(image.flags & ImageFlagBits::GpuModified)) {
         return false;
     }
-    LOG_INFO(Render_Vulkan, "Copying image with size {:#x}, max_size {:#x}",
-             image.info.guest_size_bytes, size);
     ASSERT_MSG(device_addr == image.info.guest_address,
                "Texel buffer aliases image subresources {:x} : {:x}", device_addr,
                image.info.guest_address);
     boost::container::small_vector<vk::BufferImageCopy, 8> copies;
     u32 offset = buffer.Offset(image.cpu_addr);
     const u32 num_layers = image.info.resources.layers;
-    u32 total_size = 0;
+    const u32 max_offset = offset + size;
     for (u32 m = 0; m < image.info.resources.levels; m++) {
         const u32 width = std::max(image.info.size.width >> m, 1u);
         const u32 height = std::max(image.info.size.height >> m, 1u);
@@ -600,7 +598,7 @@ bool BufferCache::SynchronizeBufferFromImage(Buffer& buffer, VAddr device_addr,
             image.info.props.is_volume ? std::max(image.info.size.depth >> m, 1u) : 1u;
         const auto& [mip_size, mip_pitch, mip_height, mip_ofs] = image.info.mips_layout[m];
         offset += mip_ofs * num_layers;
-        if (offset + (mip_size * num_layers) > buffer.SizeBytes()) {
+        if (offset + (mip_size * num_layers) > max_offset) {
             break;
         }
         copies.push_back({
@@ -616,7 +614,6 @@ bool BufferCache::SynchronizeBufferFromImage(Buffer& buffer, VAddr device_addr,
             .imageOffset = {0, 0, 0},
             .imageExtent = {width, height, depth},
         });
-        total_size += mip_size * num_layers;
     }
     if (!copies.empty()) {
         scheduler.EndRendering();