Mirrors/yuzu-fork
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu.git synced 2024-11-04 21:59:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

buffer_queue: better use of std::array

Browse source
This commit is contained in:
ameerj 2020-12-18 00:12:14 -05:00
parent 8cb683f3b9
commit 873ad1272e
1 changed files with 46 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
src/core/hle/service/nvflinger/buffer_queue.cpp
View file

@ -22,6 +22,7 @@ BufferQueue::BufferQueue(Kernel::KernelCore& kernel, u32 id, u64 layer_id)
BufferQueue::~BufferQueue() = default; BufferQueue::~BufferQueue() = default;
void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) { void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) {
ASSERT(slot < buffer_slots);
LOG_WARNING(Service, "Adding graphics buffer {}", slot); LOG_WARNING(Service, "Adding graphics buffer {}", slot);
free_buffers.push_back(slot); free_buffers.push_back(slot);
@ -44,73 +45,57 @@ std::optional<std::pair<u32, Service::Nvidia::MultiFence*>> BufferQueue::Dequeue
if (free_buffers.empty()) { if (free_buffers.empty()) {
return std::nullopt; return std::nullopt;
} }
auto f_itr = free_buffers.begin(); auto f_itr = free_buffers.begin();
auto itr = buffers.end(); auto slot = buffers.size();
while (f_itr != free_buffers.end()) { while (f_itr != free_buffers.end()) {
auto slot = *f_itr; const Buffer& buffer = buffers[*f_itr];
itr = std::find_if(buffers.begin(), buffers.end(), [&](const Buffer& buffer) { if (buffer.status == Buffer::Status::Free && buffer.igbp_buffer.width == width &&
// Only consider free buffers. Buffers become free once again after they've been buffer.igbp_buffer.height == height) {
// Acquired and Released by the compositor, see the NVFlinger::Compose method. slot = *f_itr;
if (buffer.status != Buffer::Status::Free) {
return false;
}
if (buffer.slot != slot) {
return false;
}
// Make sure that the parameters match.
return buffer.igbp_buffer.width == width && buffer.igbp_buffer.height == height;
});
if (itr != buffers.end()) {
free_buffers.erase(f_itr); free_buffers.erase(f_itr);
break; break;
} }
++f_itr; ++f_itr;
} }
if (slot == buffers.size()) {
if (itr == buffers.end()) {
return std::nullopt; return std::nullopt;
} }
buffers[slot].status = Buffer::Status::Dequeued;
itr->status = Buffer::Status::Dequeued; return {{buffers[slot].slot, &buffers[slot].multi_fence}};
return {{itr->slot, &itr->multi_fence}};
} }
const IGBPBuffer& BufferQueue::RequestBuffer(u32 slot) const { const IGBPBuffer& BufferQueue::RequestBuffer(u32 slot) const {
auto itr = std::find_if(buffers.begin(), buffers.end(), ASSERT(slot < buffers.size());
[&](const Buffer& buffer) { return buffer.slot == slot; }); ASSERT(buffers[slot].status == Buffer::Status::Dequeued);
ASSERT(itr != buffers.end()); ASSERT(buffers[slot].slot == slot);
ASSERT(itr->status == Buffer::Status::Dequeued);
return itr->igbp_buffer; return buffers[slot].igbp_buffer;
} }
void BufferQueue::QueueBuffer(u32 slot, BufferTransformFlags transform, void BufferQueue::QueueBuffer(u32 slot, BufferTransformFlags transform,
const Common::Rectangle<int>& crop_rect, u32 swap_interval, const Common::Rectangle<int>& crop_rect, u32 swap_interval,
Service::Nvidia::MultiFence& multi_fence) { Service::Nvidia::MultiFence& multi_fence) {
auto itr = std::find_if(buffers.begin(), buffers.end(), ASSERT(slot < buffers.size());
[&](const Buffer& buffer) { return buffer.slot == slot; }); ASSERT(buffers[slot].status == Buffer::Status::Dequeued);
ASSERT(itr != buffers.end()); ASSERT(buffers[slot].slot == slot);
ASSERT(itr->status == Buffer::Status::Dequeued);
itr->status = Buffer::Status::Queued; buffers[slot].status = Buffer::Status::Queued;
itr->transform = transform; buffers[slot].transform = transform;
itr->crop_rect = crop_rect; buffers[slot].crop_rect = crop_rect;
itr->swap_interval = swap_interval; buffers[slot].swap_interval = swap_interval;
itr->multi_fence = multi_fence; buffers[slot].multi_fence = multi_fence;
queue_sequence.push_back(slot); queue_sequence.push_back(slot);
} }
void BufferQueue::CancelBuffer(u32 slot, const Service::Nvidia::MultiFence& multi_fence) { void BufferQueue::CancelBuffer(u32 slot, const Service::Nvidia::MultiFence& multi_fence) {
const auto itr = std::find_if(buffers.begin(), buffers.end(), ASSERT(slot < buffers.size());
[slot](const Buffer& buffer) { return buffer.slot == slot; }); ASSERT(buffers[slot].status != Buffer::Status::Free);
ASSERT(itr != buffers.end()); ASSERT(buffers[slot].slot == slot);
ASSERT(itr->status != Buffer::Status::Free);
itr->status = Buffer::Status::Free; buffers[slot].status = Buffer::Status::Free;
itr->multi_fence = multi_fence; buffers[slot].multi_fence = multi_fence;
itr->swap_interval = 0; buffers[slot].swap_interval = 0;
free_buffers.push_back(slot); free_buffers.push_back(slot);
@ -118,28 +103,30 @@ void BufferQueue::CancelBuffer(u32 slot, const Service::Nvidia::MultiFence& mult
} }
std::optional<std::reference_wrapper<const BufferQueue::Buffer>> BufferQueue::AcquireBuffer() { std::optional<std::reference_wrapper<const BufferQueue::Buffer>> BufferQueue::AcquireBuffer() {
auto itr = buffers.end(); std::size_t buffer_slot = buffers.size();
// Iterate to find a queued buffer matching the requested slot. // Iterate to find a queued buffer matching the requested slot.
while (itr == buffers.end() && !queue_sequence.empty()) { while (buffer_slot == buffers.size() && !queue_sequence.empty()) {
const u32 slot = queue_sequence.front(); const auto slot = static_cast<std::size_t>(queue_sequence.front());
itr = std::find_if(buffers.begin(), buffers.end(), [&slot](const Buffer& buffer) { ASSERT(slot < buffers.size());
return buffer.status == Buffer::Status::Queued && buffer.slot == slot; if (buffers[slot].status == Buffer::Status::Queued) {
}); ASSERT(buffers[slot].slot == slot);
buffer_slot = slot;
}
queue_sequence.pop_front(); queue_sequence.pop_front();
} }
if (itr == buffers.end()) { if (buffer_slot == buffers.size()) {
return std::nullopt; return std::nullopt;
} }
itr->status = Buffer::Status::Acquired; buffers[buffer_slot].status = Buffer::Status::Acquired;
return *itr; return {{buffers[buffer_slot]}};
} }
void BufferQueue::ReleaseBuffer(u32 slot) { void BufferQueue::ReleaseBuffer(u32 slot) {
auto itr = std::find_if(buffers.begin(), buffers.end(), ASSERT(slot < buffers.size());
[&](const Buffer& buffer) { return buffer.slot == slot; }); ASSERT(buffers[slot].status == Buffer::Status::Acquired);
ASSERT(itr != buffers.end()); ASSERT(buffers[slot].slot == slot);
ASSERT(itr->status == Buffer::Status::Acquired);
itr->status = Buffer::Status::Free; buffers[slot].status = Buffer::Status::Free;
free_buffers.push_back(slot); free_buffers.push_back(slot);
buffer_wait_event.writable->Signal(); buffer_wait_event.writable->Signal();