Merge pull request #4838 from lioncash/syncmgr

sync_manager: Amend parameter order of calls to SyncptIncr constructor
This commit is contained in:
bunnei 2020-10-28 22:49:22 -07:00 committed by GitHub
commit c6d001c94f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions

View file

@ -27,22 +27,22 @@ SyncptIncrManager::SyncptIncrManager(GPU& gpu_) : gpu(gpu_) {}
SyncptIncrManager::~SyncptIncrManager() = default; SyncptIncrManager::~SyncptIncrManager() = default;
void SyncptIncrManager::Increment(u32 id) { void SyncptIncrManager::Increment(u32 id) {
increments.push_back(SyncptIncr{0, id, true}); increments.emplace_back(0, 0, id, true);
IncrementAllDone(); IncrementAllDone();
} }
u32 SyncptIncrManager::IncrementWhenDone(u32 class_id, u32 id) { u32 SyncptIncrManager::IncrementWhenDone(u32 class_id, u32 id) {
const u32 handle = current_id++; const u32 handle = current_id++;
increments.push_back(SyncptIncr{handle, class_id, id}); increments.emplace_back(handle, class_id, id);
return handle; return handle;
} }
void SyncptIncrManager::SignalDone(u32 handle) { void SyncptIncrManager::SignalDone(u32 handle) {
auto done_incr = std::find_if(increments.begin(), increments.end(), const auto done_incr =
[handle](SyncptIncr incr) { return incr.id == handle; }); std::find_if(increments.begin(), increments.end(),
if (done_incr != increments.end()) { [handle](const SyncptIncr& incr) { return incr.id == handle; });
const SyncptIncr incr = *done_incr; if (done_incr != increments.cend()) {
*done_incr = SyncptIncr{incr.id, incr.class_id, incr.syncpt_id, true}; done_incr->complete = true;
} }
IncrementAllDone(); IncrementAllDone();
} }

View file

@ -32,8 +32,8 @@ struct SyncptIncr {
u32 syncpt_id; u32 syncpt_id;
bool complete; bool complete;
SyncptIncr(u32 id, u32 syncpt_id_, u32 class_id_, bool done = false) SyncptIncr(u32 id_, u32 class_id_, u32 syncpt_id_, bool done = false)
: id(id), class_id(class_id_), syncpt_id(syncpt_id_), complete(done) {} : id(id_), class_id(class_id_), syncpt_id(syncpt_id_), complete(done) {}
}; };
class SyncptIncrManager { class SyncptIncrManager {