summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nvflinger
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-08-07 10:05:46 +0200
committerbunnei <bunneidev@gmail.com>2021-09-04 06:53:00 +0200
commitfb3e9314b9438bb3439e75218b38636bc3040c50 (patch)
treeb3b6222557f6da6727959e2808ff860b855de8ca /src/core/hle/service/nvflinger
parentMerge pull request #6900 from ameerj/attr-reorder (diff)
downloadyuzu-fb3e9314b9438bb3439e75218b38636bc3040c50.tar
yuzu-fb3e9314b9438bb3439e75218b38636bc3040c50.tar.gz
yuzu-fb3e9314b9438bb3439e75218b38636bc3040c50.tar.bz2
yuzu-fb3e9314b9438bb3439e75218b38636bc3040c50.tar.lz
yuzu-fb3e9314b9438bb3439e75218b38636bc3040c50.tar.xz
yuzu-fb3e9314b9438bb3439e75218b38636bc3040c50.tar.zst
yuzu-fb3e9314b9438bb3439e75218b38636bc3040c50.zip
Diffstat (limited to 'src/core/hle/service/nvflinger')
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp13
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.h3
2 files changed, 10 insertions, 6 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 941748970..32d4e360a 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -61,12 +61,13 @@ void NVFlinger::SplitVSync() {
}
}
-NVFlinger::NVFlinger(Core::System& system_) : system(system_) {
- displays.emplace_back(0, "Default", system);
- displays.emplace_back(1, "External", system);
- displays.emplace_back(2, "Edid", system);
- displays.emplace_back(3, "Internal", system);
- displays.emplace_back(4, "Null", system);
+NVFlinger::NVFlinger(Core::System& system_)
+ : system(system_), service_context(system_, "nvflinger") {
+ displays.emplace_back(0, "Default", service_context, system);
+ displays.emplace_back(1, "External", service_context, system);
+ displays.emplace_back(2, "Edid", service_context, system);
+ displays.emplace_back(3, "Internal", service_context, system);
+ displays.emplace_back(4, "Null", service_context, system);
guard = std::make_shared<std::mutex>();
// Schedule the screen composition events
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h
index d80fd07ef..6d84cafb4 100644
--- a/src/core/hle/service/nvflinger/nvflinger.h
+++ b/src/core/hle/service/nvflinger/nvflinger.h
@@ -15,6 +15,7 @@
#include <vector>
#include "common/common_types.h"
+#include "core/hle/service/kernel_helpers.h"
namespace Common {
class Event;
@@ -135,6 +136,8 @@ private:
std::unique_ptr<std::thread> vsync_thread;
std::unique_ptr<Common::Event> wait_event;
std::atomic<bool> is_running{};
+
+ KernelHelpers::ServiceContext service_context;
};
} // namespace Service::NVFlinger