diff options
author | Liam <byteslice@airmail.cc> | 2022-10-24 01:25:57 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2022-10-24 01:25:57 +0200 |
commit | 05f2673648115e53de9e04791f1d30163f90e5ee (patch) | |
tree | ae98e92b3f3a70365b4fda5099569f2bffe7f2d4 | |
parent | Merge pull request #9095 from FernandoS27/meat-good-vegetable-bad (diff) | |
download | yuzu-05f2673648115e53de9e04791f1d30163f90e5ee.tar yuzu-05f2673648115e53de9e04791f1d30163f90e5ee.tar.gz yuzu-05f2673648115e53de9e04791f1d30163f90e5ee.tar.bz2 yuzu-05f2673648115e53de9e04791f1d30163f90e5ee.tar.lz yuzu-05f2673648115e53de9e04791f1d30163f90e5ee.tar.xz yuzu-05f2673648115e53de9e04791f1d30163f90e5ee.tar.zst yuzu-05f2673648115e53de9e04791f1d30163f90e5ee.zip |
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 9d9924395..9f4c7c99a 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -53,7 +53,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger } Module::Module(Core::System& system) - : service_context{system, "nvdrv"}, events_interface{*this}, container{system.Host1x()} { + : container{system.Host1x()}, service_context{system, "nvdrv"}, events_interface{*this} { builders["/dev/nvhost-as-gpu"] = [this, &system](DeviceFD fd) { std::shared_ptr<Devices::nvdevice> device = std::make_shared<Devices::nvhost_as_gpu>(system, *this, container); diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index 146d046a9..f3c81bd88 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -97,6 +97,9 @@ private: friend class EventInterface; friend class Service::NVFlinger::NVFlinger; + /// Manages syncpoints on the host + NvCore::Container container; + /// Id to use for the next open file descriptor. DeviceFD next_fd = 1; @@ -108,9 +111,6 @@ private: EventInterface events_interface; - /// Manages syncpoints on the host - NvCore::Container container; - std::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders; }; |