diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-19 19:11:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-19 19:11:57 +0100 |
commit | a4d06631588b5524f3efb808887d95779d886025 (patch) | |
tree | 971d95fb3b4aafc553a2ce197320d2aacc192898 /src/video_core/buffer_cache | |
parent | Merge pull request #9815 from german77/qt-mouse (diff) | |
parent | Revert "shader_recompiler: Align SSBO offsets to meet host requirements" (diff) | |
download | yuzu-a4d06631588b5524f3efb808887d95779d886025.tar yuzu-a4d06631588b5524f3efb808887d95779d886025.tar.gz yuzu-a4d06631588b5524f3efb808887d95779d886025.tar.bz2 yuzu-a4d06631588b5524f3efb808887d95779d886025.tar.lz yuzu-a4d06631588b5524f3efb808887d95779d886025.tar.xz yuzu-a4d06631588b5524f3efb808887d95779d886025.tar.zst yuzu-a4d06631588b5524f3efb808887d95779d886025.zip |
Diffstat (limited to 'src/video_core/buffer_cache')
-rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 627917ab6..06fd40851 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1938,21 +1938,14 @@ typename BufferCache<P>::Binding BufferCache<P>::StorageBufferBinding(GPUVAddr s bool is_written) const { const GPUVAddr gpu_addr = gpu_memory->Read<u64>(ssbo_addr); const u32 size = gpu_memory->Read<u32>(ssbo_addr + 8); - 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 std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr); + const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); if (!cpu_addr || size == 0) { return NULL_BINDING; } - - const VAddr cpu_end = Common::AlignUp(*cpu_addr + aligned_size, Core::Memory::YUZU_PAGESIZE); + 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), + .size = is_written ? size : static_cast<u32>(cpu_end - *cpu_addr), .buffer_id = BufferId{}, }; return binding; |