diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-17 15:45:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 15:45:36 -0700 |
| commit | 7d0ec35aaa3a7e29442cf6e429d7635ef75fadbc (patch) | |
| tree | 13333321679903743dae182dc7b3efd1e7342b62 /src | |
| parent | 440443ecd42ad10c10b7469b395ee99f455a38a5 (diff) | |
| parent | 53c68f6bb37ed7e91aecccbe6fc1e75a38a6474e (diff) | |
Merge pull request #6322 from ameerj/fast-null-buffer
buffer_cache: Ensure null buffers cannot take the fast uniform bind path
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 32dcbd693a..de971041f8 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -690,7 +690,10 @@ void BufferCache<P>::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 const VAddr cpu_addr = binding.cpu_addr; const u32 size = binding.size; Buffer& buffer = slot_buffers[binding.buffer_id]; - if (size <= uniform_buffer_skip_cache_size && !buffer.IsRegionGpuModified(cpu_addr, size)) { + const bool use_fast_buffer = binding.buffer_id != NULL_BUFFER_ID && + size <= uniform_buffer_skip_cache_size && + !buffer.IsRegionGpuModified(cpu_addr, size); + if (use_fast_buffer) { if constexpr (IS_OPENGL) { if (runtime.HasFastBufferSubData()) { // Fast path for Nvidia |