mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 05:40:42 +02:00
nvdrv: fix container destruction order
This commit is contained in:
parent
0860fffd78
commit
05f2673648
@ -53,7 +53,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
|
|||||||
}
|
}
|
||||||
|
|
||||||
Module::Module(Core::System& system)
|
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) {
|
builders["/dev/nvhost-as-gpu"] = [this, &system](DeviceFD fd) {
|
||||||
std::shared_ptr<Devices::nvdevice> device =
|
std::shared_ptr<Devices::nvdevice> device =
|
||||||
std::make_shared<Devices::nvhost_as_gpu>(system, *this, container);
|
std::make_shared<Devices::nvhost_as_gpu>(system, *this, container);
|
||||||
|
@ -97,6 +97,9 @@ private:
|
|||||||
friend class EventInterface;
|
friend class EventInterface;
|
||||||
friend class Service::NVFlinger::NVFlinger;
|
friend class Service::NVFlinger::NVFlinger;
|
||||||
|
|
||||||
|
/// Manages syncpoints on the host
|
||||||
|
NvCore::Container container;
|
||||||
|
|
||||||
/// Id to use for the next open file descriptor.
|
/// Id to use for the next open file descriptor.
|
||||||
DeviceFD next_fd = 1;
|
DeviceFD next_fd = 1;
|
||||||
|
|
||||||
@ -108,9 +111,6 @@ private:
|
|||||||
|
|
||||||
EventInterface events_interface;
|
EventInterface events_interface;
|
||||||
|
|
||||||
/// Manages syncpoints on the host
|
|
||||||
NvCore::Container container;
|
|
||||||
|
|
||||||
std::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders;
|
std::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user