From 90528f132678ea7dfa9ac4588ae2b8c7808d4685 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 21 Feb 2019 11:31:53 -0500 Subject: service/nvflinger: Store BufferQueue instances as regular data members The NVFlinger service is already passed into services that need to guarantee its lifetime, so the BufferQueue instances will already live as long as they're needed. Making them std::shared_ptr instances in this case is unnecessary. --- src/core/hle/service/vi/display/vi_display.cpp | 4 ++-- src/core/hle/service/vi/display/vi_display.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/hle/service/vi/display') diff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/core/hle/service/vi/display/vi_display.cpp index 9c0afd152..01d80311b 100644 --- a/src/core/hle/service/vi/display/vi_display.cpp +++ b/src/core/hle/service/vi/display/vi_display.cpp @@ -39,11 +39,11 @@ void Display::SignalVSyncEvent() { vsync_event.writable->Signal(); } -void Display::CreateLayer(u64 id, std::shared_ptr buffer_queue) { +void Display::CreateLayer(u64 id, NVFlinger::BufferQueue& buffer_queue) { // TODO(Subv): Support more than 1 layer. ASSERT_MSG(layers.empty(), "Only one layer is supported per display at the moment"); - layers.emplace_back(id, std::move(buffer_queue)); + layers.emplace_back(id, buffer_queue); } Layer* Display::FindLayer(u64 id) { diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/core/hle/service/vi/display/vi_display.h index 8948102bc..2acd46ff8 100644 --- a/src/core/hle/service/vi/display/vi_display.h +++ b/src/core/hle/service/vi/display/vi_display.h @@ -67,7 +67,7 @@ public: /// @param id The ID to assign to the created layer. /// @param buffer_queue The buffer queue for the layer instance to use. /// - void CreateLayer(u64 id, std::shared_ptr buffer_queue); + void CreateLayer(u64 id, NVFlinger::BufferQueue& buffer_queue); /// Attempts to find a layer with the given ID. /// -- cgit v1.2.3