yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #9340 from lioncash/nvdrv 

nvdrv: Simplify builder declarations
This commit is contained in:
liamwhite 2022-11-29 08:27:13 -05:00 committed by GitHub
parent 55b546a110 ad787b20ca
commit 55a3cbfa0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,48 +55,40 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
Module::Module(Core::System& system) Module::Module(Core::System& system)
: container{system.Host1x()}, service_context{system, "nvdrv"}, events_interface{*this} { : 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 = auto device = std::make_shared<Devices::nvhost_as_gpu>(system, *this, container);
std::make_shared<Devices::nvhost_as_gpu>(system, *this, container); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
builders["/dev/nvhost-gpu"] = [this, &system](DeviceFD fd) { builders["/dev/nvhost-gpu"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = auto device = std::make_shared<Devices::nvhost_gpu>(system, events_interface, container);
std::make_shared<Devices::nvhost_gpu>(system, events_interface, container); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
builders["/dev/nvhost-ctrl-gpu"] = [this, &system](DeviceFD fd) { builders["/dev/nvhost-ctrl-gpu"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = auto device = std::make_shared<Devices::nvhost_ctrl_gpu>(system, events_interface);
std::make_shared<Devices::nvhost_ctrl_gpu>(system, events_interface); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
builders["/dev/nvmap"] = [this, &system](DeviceFD fd) { builders["/dev/nvmap"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = auto device = std::make_shared<Devices::nvmap>(system, container);
std::make_shared<Devices::nvmap>(system, container); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
builders["/dev/nvdisp_disp0"] = [this, &system](DeviceFD fd) { builders["/dev/nvdisp_disp0"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = auto device = std::make_shared<Devices::nvdisp_disp0>(system, container);
std::make_shared<Devices::nvdisp_disp0>(system, container); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
builders["/dev/nvhost-ctrl"] = [this, &system](DeviceFD fd) { builders["/dev/nvhost-ctrl"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = auto device = std::make_shared<Devices::nvhost_ctrl>(system, events_interface, container);
std::make_shared<Devices::nvhost_ctrl>(system, events_interface, container); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
builders["/dev/nvhost-nvdec"] = [this, &system](DeviceFD fd) { builders["/dev/nvhost-nvdec"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = auto device = std::make_shared<Devices::nvhost_nvdec>(system, container);
std::make_shared<Devices::nvhost_nvdec>(system, container); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
builders["/dev/nvhost-nvjpg"] = [this, &system](DeviceFD fd) { builders["/dev/nvhost-nvjpg"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = std::make_shared<Devices::nvhost_nvjpg>(system); auto device = std::make_shared<Devices::nvhost_nvjpg>(system);
return open_files.emplace(fd, device).first; return open_files.emplace(fd, std::move(device)).first;
}; };
builders["/dev/nvhost-vic"] = [this, &system](DeviceFD fd) { builders["/dev/nvhost-vic"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device = auto device = std::make_shared<Devices::nvhost_vic>(system, container);
std::make_shared<Devices::nvhost_vic>(system, container); return open_files.emplace(fd, std::move(device)).first;
return open_files.emplace(fd, device).first;
}; };
} }