mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-25 00:27:18 +02:00
nvdrv: Simplify builder declarations
We can just use auto here. If one of these ever happens to not be derived from nvdevice, then this will cause a compilation error. We can also move the devices into the collection to get rid of an unnecessary atomic reference count increment and decrement.
This commit is contained in:
parent
6291eec700
commit
ad787b20ca
@ -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;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user