diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-07-07 08:12:21 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-07-07 08:30:22 +0200 |
commit | 86a874a2fce5ec9ab6513eee689af1a63278dc9e (patch) | |
tree | fcd5009275c24ad92fd72ba94dc0abc20ba39fbe /src/video_core/renderer_vulkan/vk_stream_buffer.cpp | |
parent | Merge pull request #2674 from lioncash/reporter (diff) | |
download | yuzu-86a874a2fce5ec9ab6513eee689af1a63278dc9e.tar yuzu-86a874a2fce5ec9ab6513eee689af1a63278dc9e.tar.gz yuzu-86a874a2fce5ec9ab6513eee689af1a63278dc9e.tar.bz2 yuzu-86a874a2fce5ec9ab6513eee689af1a63278dc9e.tar.lz yuzu-86a874a2fce5ec9ab6513eee689af1a63278dc9e.tar.xz yuzu-86a874a2fce5ec9ab6513eee689af1a63278dc9e.tar.zst yuzu-86a874a2fce5ec9ab6513eee689af1a63278dc9e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_stream_buffer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/renderer_vulkan/vk_stream_buffer.cpp b/src/video_core/renderer_vulkan/vk_stream_buffer.cpp index 58ffa42f2..62f1427f5 100644 --- a/src/video_core/renderer_vulkan/vk_stream_buffer.cpp +++ b/src/video_core/renderer_vulkan/vk_stream_buffer.cpp @@ -46,12 +46,12 @@ std::tuple<u8*, u64, bool> VKStreamBuffer::Reserve(u64 size) { return {mapped_pointer + offset, offset, invalidation_mark.has_value()}; } -VKExecutionContext VKStreamBuffer::Send(VKExecutionContext exctx, u64 size) { +void VKStreamBuffer::Send(u64 size) { ASSERT_MSG(size <= mapped_size, "Reserved size is too small"); if (invalidation_mark) { // TODO(Rodrigo): Find a better way to invalidate than waiting for all watches to finish. - exctx = scheduler.Flush(); + scheduler.Flush(); std::for_each(watches.begin(), watches.begin() + *invalidation_mark, [&](auto& resource) { resource->Wait(); }); invalidation_mark = std::nullopt; @@ -62,11 +62,9 @@ VKExecutionContext VKStreamBuffer::Send(VKExecutionContext exctx, u64 size) { ReserveWatches(WATCHES_RESERVE_CHUNK); } // Add a watch for this allocation. - watches[used_watches++]->Watch(exctx.GetFence()); + watches[used_watches++]->Watch(scheduler.GetFence()); offset += size; - - return exctx; } void VKStreamBuffer::CreateBuffers(VKMemoryManager& memory_manager, vk::BufferUsageFlags usage) { |