diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-08 17:58:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 17:58:45 +0200 |
| commit | 448264e7195ef3075b39ea6aa410818ff956cf96 (patch) | |
| tree | 1acd49ca071c8a0433a68bd875fec2814c7f8723 /src/core/hle/service/nvdrv/nvdrv.cpp | |
| parent | Merge pull request #972 from lioncash/catch (diff) | |
| parent | nvdrv: Get rid of global std::weak_ptr (diff) | |
| download | yuzu-448264e7195ef3075b39ea6aa410818ff956cf96.tar yuzu-448264e7195ef3075b39ea6aa410818ff956cf96.tar.gz yuzu-448264e7195ef3075b39ea6aa410818ff956cf96.tar.bz2 yuzu-448264e7195ef3075b39ea6aa410818ff956cf96.tar.lz yuzu-448264e7195ef3075b39ea6aa410818ff956cf96.tar.xz yuzu-448264e7195ef3075b39ea6aa410818ff956cf96.tar.zst yuzu-448264e7195ef3075b39ea6aa410818ff956cf96.zip | |
Diffstat (limited to 'src/core/hle/service/nvdrv/nvdrv.cpp')
| -rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index e8b30921a..427f4b574 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -16,19 +16,18 @@ #include "core/hle/service/nvdrv/interface.h" #include "core/hle/service/nvdrv/nvdrv.h" #include "core/hle/service/nvdrv/nvmemp.h" +#include "core/hle/service/nvflinger/nvflinger.h" namespace Service::Nvidia { -std::weak_ptr<Module> nvdrv; - -void InstallInterfaces(SM::ServiceManager& service_manager) { +void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger& nvflinger) { auto module_ = std::make_shared<Module>(); std::make_shared<NVDRV>(module_, "nvdrv")->InstallAsService(service_manager); std::make_shared<NVDRV>(module_, "nvdrv:a")->InstallAsService(service_manager); std::make_shared<NVDRV>(module_, "nvdrv:s")->InstallAsService(service_manager); std::make_shared<NVDRV>(module_, "nvdrv:t")->InstallAsService(service_manager); std::make_shared<NVMEMP>()->InstallAsService(service_manager); - nvdrv = module_; + nvflinger.SetNVDrvInstance(module_); } Module::Module() { |