summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_vulkan/vk_stream_buffer.cpp
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-09-10 08:43:30 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-09-19 06:46:37 +0200
commit58b0ae84b56996304b6ad373e4f6cff2cf6bdd41 (patch)
tree9b7c3e28fa7445c78304902efe660356c59cad57 /src/video_core/renderer_vulkan/vk_stream_buffer.cpp
parentMerge pull request #4663 from ReinUsesLisp/wswitch (diff)
downloadyuzu-58b0ae84b56996304b6ad373e4f6cff2cf6bdd41.tar
yuzu-58b0ae84b56996304b6ad373e4f6cff2cf6bdd41.tar.gz
yuzu-58b0ae84b56996304b6ad373e4f6cff2cf6bdd41.tar.bz2
yuzu-58b0ae84b56996304b6ad373e4f6cff2cf6bdd41.tar.lz
yuzu-58b0ae84b56996304b6ad373e4f6cff2cf6bdd41.tar.xz
yuzu-58b0ae84b56996304b6ad373e4f6cff2cf6bdd41.tar.zst
yuzu-58b0ae84b56996304b6ad373e4f6cff2cf6bdd41.zip
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_stream_buffer.cpp')
-rw-r--r--src/video_core/renderer_vulkan/vk_stream_buffer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_stream_buffer.cpp b/src/video_core/renderer_vulkan/vk_stream_buffer.cpp
index 3c9171a5e..5218c875b 100644
--- a/src/video_core/renderer_vulkan/vk_stream_buffer.cpp
+++ b/src/video_core/renderer_vulkan/vk_stream_buffer.cpp
@@ -11,7 +11,6 @@
#include "common/alignment.h"
#include "common/assert.h"
#include "video_core/renderer_vulkan/vk_device.h"
-#include "video_core/renderer_vulkan/vk_resource_manager.h"
#include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_stream_buffer.h"
#include "video_core/renderer_vulkan/wrapper.h"
@@ -111,7 +110,7 @@ void VKStreamBuffer::Unmap(u64 size) {
}
auto& watch = current_watches[current_watch_cursor++];
watch.upper_bound = offset;
- watch.fence.Watch(scheduler.GetFence());
+ watch.tick = scheduler.CurrentTick();
}
void VKStreamBuffer::CreateBuffers(VkBufferUsageFlags usage) {
@@ -157,7 +156,7 @@ void VKStreamBuffer::WaitPendingOperations(u64 requested_upper_bound) {
while (requested_upper_bound < wait_bound && wait_cursor < *invalidation_mark) {
auto& watch = previous_watches[wait_cursor];
wait_bound = watch.upper_bound;
- watch.fence.Wait();
+ scheduler.Wait(watch.tick);
++wait_cursor;
}
}