From 170e19d4eab455ad4d28ad72799cc6687692392d Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 17 Jul 2018 00:05:13 -0400 Subject: nvflinger: Fix for BufferQueue event handling. --- src/core/hle/service/nvflinger/buffer_queue.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'src/core/hle/service/nvflinger/buffer_queue.cpp') diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp index f7f2fe1b2..a181cd2dc 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue.cpp @@ -13,8 +13,8 @@ namespace Service { namespace NVFlinger { BufferQueue::BufferQueue(u32 id, u64 layer_id) : id(id), layer_id(layer_id) { - native_handle = Kernel::Event::Create(Kernel::ResetType::OneShot, "BufferQueue NativeHandle"); - native_handle->Signal(); + buffer_wait_event = + Kernel::Event::Create(Kernel::ResetType::Sticky, "BufferQueue NativeHandle"); } void BufferQueue::SetPreallocatedBuffer(u32 slot, IGBPBuffer& igbp_buffer) { @@ -26,10 +26,7 @@ void BufferQueue::SetPreallocatedBuffer(u32 slot, IGBPBuffer& igbp_buffer) { LOG_WARNING(Service, "Adding graphics buffer {}", slot); queue.emplace_back(buffer); - - if (buffer_wait_event) { - buffer_wait_event->Signal(); - } + buffer_wait_event->Signal(); } boost::optional BufferQueue::DequeueBuffer(u32 width, u32 height) { @@ -48,8 +45,6 @@ boost::optional BufferQueue::DequeueBuffer(u32 width, u32 height) { return boost::none; } - buffer_wait_event = nullptr; - itr->status = Buffer::Status::Dequeued; return itr->slot; } @@ -88,9 +83,7 @@ void BufferQueue::ReleaseBuffer(u32 slot) { ASSERT(itr->status == Buffer::Status::Acquired); itr->status = Buffer::Status::Free; - if (buffer_wait_event) { - buffer_wait_event->Signal(); - } + buffer_wait_event->Signal(); } u32 BufferQueue::Query(QueryType type) { @@ -106,10 +99,5 @@ u32 BufferQueue::Query(QueryType type) { return 0; } -void BufferQueue::SetBufferWaitEvent(Kernel::SharedPtr&& wait_event) { - ASSERT_MSG(!buffer_wait_event, "buffer_wait_event only supports a single waiting thread!"); - buffer_wait_event = std::move(wait_event); -} - } // namespace NVFlinger } // namespace Service -- cgit v1.2.3