diff options
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 | |||
| 1938 | bool is_written) const { | 1938 | bool is_written) const { |
| 1939 | const GPUVAddr gpu_addr = gpu_memory->Read<u64>(ssbo_addr); | 1939 | const GPUVAddr gpu_addr = gpu_memory->Read<u64>(ssbo_addr); |
| 1940 | const u32 size = gpu_memory->Read<u32>(ssbo_addr + 8); | 1940 | const u32 size = gpu_memory->Read<u32>(ssbo_addr + 8); |
| 1941 | const u32 alignment = runtime.GetStorageBufferAlignment(); | 1941 | const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr); |
| 1942 | |||
| 1943 | const GPUVAddr aligned_gpu_addr = Common::AlignDown(gpu_addr, alignment); | ||
| 1944 | const u32 aligned_size = | ||
| 1945 | Common::AlignUp(static_cast<u32>(gpu_addr - aligned_gpu_addr) + size, alignment); | ||
| 1946 | |||
| 1947 | const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr); | ||
| 1948 | if (!cpu_addr || size == 0) { | 1942 | if (!cpu_addr || size == 0) { |
| 1949 | return NULL_BINDING; | 1943 | return NULL_BINDING; |
| 1950 | } | 1944 | } |
| 1951 | 1945 | const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE); | |
| 1952 | const VAddr cpu_end = Common::AlignUp(*cpu_addr + aligned_size, Core::Memory::YUZU_PAGESIZE); | ||
| 1953 | const Binding binding{ | 1946 | const Binding binding{ |
| 1954 | .cpu_addr = *cpu_addr, | 1947 | .cpu_addr = *cpu_addr, |
| 1955 | .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *cpu_addr), | 1948 | .size = is_written ? size : static_cast<u32>(cpu_end - *cpu_addr), |
| 1956 | .buffer_id = BufferId{}, | 1949 | .buffer_id = BufferId{}, |
| 1957 | }; | 1950 | }; |
| 1958 | return binding; | 1951 | return binding; |