yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #4475 from lioncash/bqueue 

buffer_queue: Make use of designated initializers/std::nullopt where applicable
This commit is contained in:
bunnei 2020-08-05 16:56:46 -04:00 committed by GitHub
parent e8868c2ed1 9b837c6069
commit 61678c4e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/hle/service/nvflinger/buffer_queue.cpp
View File

@ -24,13 +24,13 @@ BufferQueue::~BufferQueue() = default;
void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) { void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) {
LOG_WARNING(Service, "Adding graphics buffer {}", slot); LOG_WARNING(Service, "Adding graphics buffer {}", slot);
Buffer buffer{};
buffer.slot = slot;
buffer.igbp_buffer = igbp_buffer;
buffer.status = Buffer::Status::Free;
free_buffers.push_back(slot); free_buffers.push_back(slot);
queue.push_back({
.slot = slot,
.status = Buffer::Status::Free,
.igbp_buffer = igbp_buffer,
});
queue.emplace_back(buffer);
buffer_wait_event.writable->Signal(); buffer_wait_event.writable->Signal();
} }
@ -38,7 +38,7 @@ std::optional<std::pair<u32, Service::Nvidia::MultiFence*>> BufferQueue::Dequeue
u32 height) { u32 height) {
if (free_buffers.empty()) { if (free_buffers.empty()) {
return {}; return std::nullopt;
} }
auto f_itr = free_buffers.begin(); auto f_itr = free_buffers.begin();
@ -69,7 +69,7 @@ std::optional<std::pair<u32, Service::Nvidia::MultiFence*>> BufferQueue::Dequeue
} }
if (itr == queue.end()) { if (itr == queue.end()) {
return {}; return std::nullopt;
} }
itr->status = Buffer::Status::Dequeued; itr->status = Buffer::Status::Dequeued;
@ -103,14 +103,15 @@ std::optional<std::reference_wrapper<const BufferQueue::Buffer>> BufferQueue::Ac
auto itr = queue.end(); auto itr = queue.end();
// Iterate to find a queued buffer matching the requested slot. // Iterate to find a queued buffer matching the requested slot.
while (itr == queue.end() && !queue_sequence.empty()) { while (itr == queue.end() && !queue_sequence.empty()) {
u32 slot = queue_sequence.front(); const u32 slot = queue_sequence.front();
itr = std::find_if(queue.begin(), queue.end(), [&slot](const Buffer& buffer) { itr = std::find_if(queue.begin(), queue.end(), [&slot](const Buffer& buffer) {
return buffer.status == Buffer::Status::Queued && buffer.slot == slot; return buffer.status == Buffer::Status::Queued && buffer.slot == slot;
}); });
queue_sequence.pop_front(); queue_sequence.pop_front();
} }
if (itr == queue.end()) if (itr == queue.end()) {
return {}; return std::nullopt;
}
itr->status = Buffer::Status::Acquired; itr->status = Buffer::Status::Acquired;
return *itr; return *itr;
} }