VERY experimental Nintendo Switch 2 emulator
C++
buffer_cache: Apply storage buffer alignment only to the offset
Ameer Jf4848349b55f
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.hindex 9202e53c75..5574c61300 100644--- a/src/video_core/buffer_cache/buffer_cache.h+++ b/src/video_core/buffer_cache/buffer_cache.h@@ -1770,7 +1770,6 @@ template <class P>Binding BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,bool is_written) const {const GPUVAddr gpu_addr = gpu_memory->Read<u64>(ssbo_addr);- const u32 alignment = runtime.GetStorageBufferAlignment();const auto size = [&]() {const bool is_nvn_cbuf = cbuf_index == 0;// The NVN driver buffer (index 0) is known to pack the SSBO address followed by its size.@@ -1786,19 +1785,24 @@ Binding BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,const u32 memory_layout_size = static_cast<u32>(gpu_memory->GetMemoryLayoutSize(gpu_addr));return std::min(memory_layout_size, static_cast<u32>(8_MiB));}();+ // Alignment only applies to the offset of the buffer+ const u32 alignment = runtime.GetStorageBufferAlignment();const GPUVAddr aligned_gpu_addr = Common::AlignDown(gpu_addr, alignment);- const u32 aligned_size =- Common::AlignUp(static_cast<u32>(gpu_addr - aligned_gpu_addr) + size, alignment);+ const u32 aligned_size = static_cast<u32>(gpu_addr - aligned_gpu_addr) + size;- const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr);- if (!cpu_addr || size == 0) {+ const std::optional<VAddr> aligned_cpu_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr);+ if (!aligned_cpu_addr || size == 0) {LOG_WARNING(HW_GPU, "Failed to find storage buffer for cbuf index {}", cbuf_index);return NULL_BINDING;}- const VAddr cpu_end = Common::AlignUp(*cpu_addr + aligned_size, Core::Memory::YUZU_PAGESIZE);+ const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr);+ ASSERT_MSG(cpu_addr, "Unaligned storage buffer address not found for cbuf index {}", cbuf_index);+ // The end address used for size calculation does not need to be aligned+ const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE);+const Binding binding{- .cpu_addr = *cpu_addr,- .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *cpu_addr),+ .cpu_addr = *aligned_cpu_addr,+ .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *aligned_cpu_addr),.buffer_id = BufferId{},};return binding;