diff options
author | bunnei <bunneidev@gmail.com> | 2018-12-03 23:05:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-03 23:05:57 +0100 |
commit | ef69b4b83050967732e6e977396111289c9e86ba (patch) | |
tree | 0f0908b21f5cec9dca4d2269cd724cfca81848db /src/core/hle/service/nvflinger/nvflinger.cpp | |
parent | Merge pull request #1833 from lioncash/clean (diff) | |
parent | hle_ipc: Refactor SleepClientThread to avoid ReadableEvent (diff) | |
download | yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar.gz yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar.bz2 yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar.lz yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar.xz yuzu-ef69b4b83050967732e6e977396111289c9e86ba.tar.zst yuzu-ef69b4b83050967732e6e977396111289c9e86ba.zip |
Diffstat (limited to 'src/core/hle/service/nvflinger/nvflinger.cpp')
-rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index 214e6d1b3..05af2d593 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -13,6 +13,9 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/core_timing_util.h" +#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/readable_event.h" +#include "core/hle/kernel/writable_event.h" #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" #include "core/hle/service/nvdrv/nvdrv.h" #include "core/hle/service/nvflinger/buffer_queue.h" @@ -83,9 +86,8 @@ u32 NVFlinger::GetBufferQueueId(u64 display_id, u64 layer_id) { return layer.buffer_queue->GetId(); } -Kernel::SharedPtr<Kernel::Event> NVFlinger::GetVsyncEvent(u64 display_id) { - const auto& display = GetDisplay(display_id); - return display.vsync_event; +Kernel::SharedPtr<Kernel::ReadableEvent> NVFlinger::GetVsyncEvent(u64 display_id) { + return GetDisplay(display_id).vsync_event.readable; } std::shared_ptr<BufferQueue> NVFlinger::GetBufferQueue(u32 id) const { @@ -117,7 +119,7 @@ Layer& NVFlinger::GetLayer(u64 display_id, u64 layer_id) { void NVFlinger::Compose() { for (auto& display : displays) { // Trigger vsync for this display at the end of drawing - SCOPE_EXIT({ display.vsync_event->Signal(); }); + SCOPE_EXIT({ display.vsync_event.writable->Signal(); }); // Don't do anything for displays without layers. if (display.layers.empty()) @@ -164,7 +166,8 @@ Layer::~Layer() = default; Display::Display(u64 id, std::string name) : id(id), name(std::move(name)) { auto& kernel = Core::System::GetInstance().Kernel(); - vsync_event = Kernel::Event::Create(kernel, Kernel::ResetType::Pulse, "Display VSync Event"); + vsync_event = Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Pulse, + fmt::format("Display VSync Event {}", id)); } Display::~Display() = default; |