diff options
author | bunnei <bunneidev@gmail.com> | 2020-12-31 07:06:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-31 07:06:05 +0100 |
commit | 25d607f5f63929369fb74f386a920b69bb24f442 (patch) | |
tree | 9ee5a023f033d99561a0358c5c71aeecc92c9d64 /src/core/hle/service/nvflinger/nvflinger.h | |
parent | Merge pull request #5263 from lioncash/uninit (diff) | |
parent | hle: kernel: service_thread: Make thread naming more consistent. (diff) | |
download | yuzu-25d607f5f63929369fb74f386a920b69bb24f442.tar yuzu-25d607f5f63929369fb74f386a920b69bb24f442.tar.gz yuzu-25d607f5f63929369fb74f386a920b69bb24f442.tar.bz2 yuzu-25d607f5f63929369fb74f386a920b69bb24f442.tar.lz yuzu-25d607f5f63929369fb74f386a920b69bb24f442.tar.xz yuzu-25d607f5f63929369fb74f386a920b69bb24f442.tar.zst yuzu-25d607f5f63929369fb74f386a920b69bb24f442.zip |
Diffstat (limited to 'src/core/hle/service/nvflinger/nvflinger.h')
-rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h index 1ebe949c0..c6765259f 100644 --- a/src/core/hle/service/nvflinger/nvflinger.h +++ b/src/core/hle/service/nvflinger/nvflinger.h @@ -75,10 +75,7 @@ public: [[nodiscard]] std::shared_ptr<Kernel::ReadableEvent> FindVsyncEvent(u64 display_id) const; /// Obtains a buffer queue identified by the ID. - [[nodiscard]] BufferQueue& FindBufferQueue(u32 id); - - /// Obtains a buffer queue identified by the ID. - [[nodiscard]] const BufferQueue& FindBufferQueue(u32 id) const; + [[nodiscard]] BufferQueue* FindBufferQueue(u32 id); /// Performs a composition request to the emulated nvidia GPU and triggers the vsync events when /// finished. @@ -86,11 +83,11 @@ public: [[nodiscard]] s64 GetNextTicks() const; +private: [[nodiscard]] std::unique_lock<std::mutex> Lock() const { return std::unique_lock{*guard}; } -private: /// Finds the display identified by the specified ID. [[nodiscard]] VI::Display* FindDisplay(u64 display_id); @@ -110,7 +107,7 @@ private: std::shared_ptr<Nvidia::Module> nvdrv; std::vector<VI::Display> displays; - std::vector<BufferQueue> buffer_queues; + std::vector<std::unique_ptr<BufferQueue>> buffer_queues; /// Id to use for the next layer that is created, this counter is shared among all displays. u64 next_layer_id = 1; |