diff options
Diffstat (limited to 'src/core/hle/service/nvflinger')
-rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.cpp | 20 | ||||
-rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.h | 8 | ||||
-rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 3 |
3 files changed, 6 insertions, 25 deletions
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<u32> BufferQueue::DequeueBuffer(u32 width, u32 height) { @@ -48,8 +45,6 @@ boost::optional<u32> 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<Kernel::Event>&& 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 diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h index 1de5767cb..1e55b487e 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.h +++ b/src/core/hle/service/nvflinger/buffer_queue.h @@ -77,14 +77,13 @@ public: boost::optional<const Buffer&> AcquireBuffer(); void ReleaseBuffer(u32 slot); u32 Query(QueryType type); - void SetBufferWaitEvent(Kernel::SharedPtr<Kernel::Event>&& wait_event); u32 GetId() const { return id; } - Kernel::SharedPtr<Kernel::Event> GetNativeHandle() const { - return native_handle; + Kernel::SharedPtr<Kernel::Event> GetBufferWaitEvent() const { + return buffer_wait_event; } private: @@ -92,9 +91,6 @@ private: u64 layer_id; std::vector<Buffer> queue; - Kernel::SharedPtr<Kernel::Event> native_handle; - - /// Used to signal waiting thread when no buffers are available Kernel::SharedPtr<Kernel::Event> buffer_wait_event; }; diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index ef3c2cc98..826646b7d 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -152,9 +152,6 @@ void NVFlinger::Compose() { igbp_buffer.width, igbp_buffer.height, igbp_buffer.stride, buffer->transform); buffer_queue->ReleaseBuffer(buffer->slot); - - // TODO(Subv): Figure out when we should actually signal this event. - buffer_queue->GetNativeHandle()->Signal(); } } |