diff options
author | Lioncash <mathew1800@gmail.com> | 2020-10-27 08:02:39 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-10-27 08:22:57 +0100 |
commit | 047e77e2f0768775c765d8098ee8475018a06270 (patch) | |
tree | 0af25fb5d7aef5f439be5c4f88a39e5cc0b17b8d | |
parent | Merge pull request #4729 from ameerj/nvdec-prod (diff) | |
download | yuzu-047e77e2f0768775c765d8098ee8475018a06270.tar yuzu-047e77e2f0768775c765d8098ee8475018a06270.tar.gz yuzu-047e77e2f0768775c765d8098ee8475018a06270.tar.bz2 yuzu-047e77e2f0768775c765d8098ee8475018a06270.tar.lz yuzu-047e77e2f0768775c765d8098ee8475018a06270.tar.xz yuzu-047e77e2f0768775c765d8098ee8475018a06270.tar.zst yuzu-047e77e2f0768775c765d8098ee8475018a06270.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/command_classes/sync_manager.cpp | 14 | ||||
-rw-r--r-- | src/video_core/command_classes/sync_manager.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/video_core/command_classes/sync_manager.cpp b/src/video_core/command_classes/sync_manager.cpp index a0ab44855..19dc9e0ab 100644 --- a/src/video_core/command_classes/sync_manager.cpp +++ b/src/video_core/command_classes/sync_manager.cpp @@ -27,22 +27,22 @@ SyncptIncrManager::SyncptIncrManager(GPU& gpu_) : gpu(gpu_) {} SyncptIncrManager::~SyncptIncrManager() = default; void SyncptIncrManager::Increment(u32 id) { - increments.push_back(SyncptIncr{0, id, true}); + increments.emplace_back(0, 0, id, true); IncrementAllDone(); } u32 SyncptIncrManager::IncrementWhenDone(u32 class_id, u32 id) { const u32 handle = current_id++; - increments.push_back(SyncptIncr{handle, class_id, id}); + increments.emplace_back(handle, class_id, id); return handle; } void SyncptIncrManager::SignalDone(u32 handle) { - auto done_incr = std::find_if(increments.begin(), increments.end(), - [handle](SyncptIncr incr) { return incr.id == handle; }); - if (done_incr != increments.end()) { - const SyncptIncr incr = *done_incr; - *done_incr = SyncptIncr{incr.id, incr.class_id, incr.syncpt_id, true}; + const auto done_incr = + std::find_if(increments.begin(), increments.end(), + [handle](const SyncptIncr& incr) { return incr.id == handle; }); + if (done_incr != increments.cend()) { + done_incr->complete = true; } IncrementAllDone(); } diff --git a/src/video_core/command_classes/sync_manager.h b/src/video_core/command_classes/sync_manager.h index 353b67573..2c321ec58 100644 --- a/src/video_core/command_classes/sync_manager.h +++ b/src/video_core/command_classes/sync_manager.h @@ -32,8 +32,8 @@ struct SyncptIncr { u32 syncpt_id; bool complete; - SyncptIncr(u32 id, u32 syncpt_id_, u32 class_id_, bool done = false) - : id(id), class_id(class_id_), syncpt_id(syncpt_id_), complete(done) {} + SyncptIncr(u32 id_, u32 class_id_, u32 syncpt_id_, bool done = false) + : id(id_), class_id(class_id_), syncpt_id(syncpt_id_), complete(done) {} }; class SyncptIncrManager { |