OpenPunk/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-12-27 09:30:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9122 from liamwhite/burnt-chicken

Browse Source 
nvdrv: fix container destruction order
This commit is contained in:
Fernando S 2022-10-24 12:41:46 +02:00 committed by GitHub
commit 2e782a154d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/service/nvdrv/nvdrv.cpp
View File

@ -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);

6
src/core/hle/service/nvdrv/nvdrv.h
View File

@ -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;
}; };