diff options
author | Fernando S <fsahmkow27@gmail.com> | 2023-01-06 16:06:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-06 16:06:45 +0100 |
commit | 8b251fc3f60330f1b1311af2d17cdb1ae9874683 (patch) | |
tree | 9c9eca32c58912170c07097d885fc08672cb40a8 /src/video_core/buffer_cache/buffer_cache.h | |
parent | Merge pull request #9561 from liamwhite/update-dynarmic (diff) | |
parent | Run clang-format (diff) | |
download | yuzu-8b251fc3f60330f1b1311af2d17cdb1ae9874683.tar yuzu-8b251fc3f60330f1b1311af2d17cdb1ae9874683.tar.gz yuzu-8b251fc3f60330f1b1311af2d17cdb1ae9874683.tar.bz2 yuzu-8b251fc3f60330f1b1311af2d17cdb1ae9874683.tar.lz yuzu-8b251fc3f60330f1b1311af2d17cdb1ae9874683.tar.xz yuzu-8b251fc3f60330f1b1311af2d17cdb1ae9874683.tar.zst yuzu-8b251fc3f60330f1b1311af2d17cdb1ae9874683.zip |
Diffstat (limited to 'src/video_core/buffer_cache/buffer_cache.h')
-rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 06fd40851..627917ab6 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1938,14 +1938,21 @@ 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 std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); + 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); if (!cpu_addr || size == 0) { return NULL_BINDING; } - const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE); + + const VAddr cpu_end = Common::AlignUp(*cpu_addr + aligned_size, Core::Memory::YUZU_PAGESIZE); const Binding binding{ .cpu_addr = *cpu_addr, - .size = is_written ? size : static_cast<u32>(cpu_end - *cpu_addr), + .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *cpu_addr), .buffer_id = BufferId{}, }; return binding; |