summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/service.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-01-22 23:52:47 +0100
committerGitHub <noreply@github.com>2018-01-22 23:52:47 +0100
commitd8bd70d396597d652e8eb891175192ffaf728593 (patch)
tree01062c3da533e1b1469fed9781c38aecb91ce3ba /src/core/hle/service/service.cpp
parentMerge pull request #134 from gdkchan/audout_hid_fix (diff)
parentAppletOE: Stubbed CreateManagedDisplayLayer to create a new layer in the Default display. (diff)
downloadyuzu-d8bd70d396597d652e8eb891175192ffaf728593.tar
yuzu-d8bd70d396597d652e8eb891175192ffaf728593.tar.gz
yuzu-d8bd70d396597d652e8eb891175192ffaf728593.tar.bz2
yuzu-d8bd70d396597d652e8eb891175192ffaf728593.tar.lz
yuzu-d8bd70d396597d652e8eb891175192ffaf728593.tar.xz
yuzu-d8bd70d396597d652e8eb891175192ffaf728593.tar.zst
yuzu-d8bd70d396597d652e8eb891175192ffaf728593.zip
Diffstat (limited to 'src/core/hle/service/service.cpp')
-rw-r--r--src/core/hle/service/service.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 3f5ce56c6..1b8565351 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -165,11 +165,15 @@ void AddNamedPort(std::string name, SharedPtr<ClientPort> port) {
/// Initialize ServiceManager
void Init() {
+ // NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it
+ // here and pass it into the respective InstallInterfaces functions.
+ auto nv_flinger = std::make_shared<NVFlinger::NVFlinger>();
+
SM::g_service_manager = std::make_shared<SM::ServiceManager>();
SM::ServiceManager::InstallInterfaces(SM::g_service_manager);
Account::InstallInterfaces(*SM::g_service_manager);
- AM::InstallInterfaces(*SM::g_service_manager);
+ AM::InstallInterfaces(*SM::g_service_manager, nv_flinger);
AOC::InstallInterfaces(*SM::g_service_manager);
APM::InstallInterfaces(*SM::g_service_manager);
Audio::InstallInterfaces(*SM::g_service_manager);
@@ -180,7 +184,7 @@ void Init() {
PCTL::InstallInterfaces(*SM::g_service_manager);
Sockets::InstallInterfaces(*SM::g_service_manager);
Time::InstallInterfaces(*SM::g_service_manager);
- VI::InstallInterfaces(*SM::g_service_manager);
+ VI::InstallInterfaces(*SM::g_service_manager, nv_flinger);
Set::InstallInterfaces(*SM::g_service_manager);
LOG_DEBUG(Service, "initialized OK");