VERY experimental Nintendo Switch 2 emulator
C++
video_core: differentiate between tiled and untiled framebuffer sizes for unaccelerated copies
Liamc642834b4df0
diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cppindex 4a1d963222..27e6ebf948 100644--- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp+++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp@@ -87,12 +87,8 @@ u32 GetBytesPerPixel(const Tegra::FramebufferConfig& framebuffer) {}std::size_t GetSizeInBytes(const Tegra::FramebufferConfig& framebuffer) {- // TODO(Rodrigo): Read this from HLE- constexpr u32 block_height_log2 = 4;- const u32 bytes_per_pixel = GetBytesPerPixel(framebuffer);- const u64 size_bytes{Tegra::Texture::CalculateSize(- true, bytes_per_pixel, framebuffer.stride, framebuffer.height, 1, block_height_log2, 0)};- return size_bytes;+ return static_cast<std::size_t>(framebuffer.stride) *+ static_cast<std::size_t>(framebuffer.height) * GetBytesPerPixel(framebuffer);}VkFormat GetFormat(const Tegra::FramebufferConfig& framebuffer) {@@ -173,10 +169,12 @@ VkSemaphore BlitScreen::Draw(const Tegra::FramebufferConfig& framebuffer,// TODO(Rodrigo): Read this from HLEconstexpr u32 block_height_log2 = 4;const u32 bytes_per_pixel = GetBytesPerPixel(framebuffer);- const u64 size_bytes{GetSizeInBytes(framebuffer)};-+ const u64 linear_size{GetSizeInBytes(framebuffer)};+ const u64 tiled_size{Tegra::Texture::CalculateSize(true, bytes_per_pixel,+ framebuffer.stride, framebuffer.height,+ 1, block_height_log2, 0)};Tegra::Texture::UnswizzleTexture(- mapped_span.subspan(image_offset, size_bytes), std::span(host_ptr, size_bytes),+ mapped_span.subspan(image_offset, linear_size), std::span(host_ptr, tiled_size),bytes_per_pixel, framebuffer.width, framebuffer.height, 1, block_height_log2, 0);const VkBufferImageCopy copy{