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 | 93bc59b62d8fa4f19bc26a10242fba48d93ceb04 (patch) | |
| tree | 13333321679903743dae182dc7b3efd1e7342b62 | |
| parent | b462618ed771ad76283781fa5b7368a2ab64e539 (diff) | |
| parent | acf22336ecc9b2271f9fbcdb62493221631d7342 (diff) | |
Merge pull request #6322 from ameerj/fast-null-buffer
buffer_cache: Ensure null buffers cannot take the fast uniform bind path
| -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 32dcbd693..de971041f 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 |