ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[App] Only create input nop driver when explicitly requested.

This commit is contained in:
gibbed 2019-08-03 20:07:19 -05:00
parent e5eb59df71
commit 02ea74becd
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xenia/app/xenia_main.cc
View File

@ -124,7 +124,7 @@ class Factory {
if (it != creators_.cend() && (*it).is_available()) { if (it != creators_.cend() && (*it).is_available()) {
auto instance = (*it).instantiate(std::forward<Args>(args)...); auto instance = (*it).instantiate(std::forward<Args>(args)...);
if (instance) { if (instance) {
instances.push_back(std::move(instance)); instances.emplace_back(std::move(instance));
} }
} }
} else { } else {
@ -132,7 +132,7 @@ class Factory {
if (!creator.is_available()) continue; if (!creator.is_available()) continue;
auto instance = creator.instantiate(std::forward<Args>(args)...); auto instance = creator.instantiate(std::forward<Args>(args)...);
if (instance) { if (instance) {
instances.push_back(std::move(instance)); instances.emplace_back(std::move(instance));
} }
} }
} }
@ -161,29 +161,25 @@ std::unique_ptr<gpu::GraphicsSystem> CreateGraphicsSystem() {
std::vector<std::unique_ptr<hid::InputDriver>> CreateInputDrivers( std::vector<std::unique_ptr<hid::InputDriver>> CreateInputDrivers(
ui::Window* window) { ui::Window* window) {
std::vector<std::unique_ptr<hid::InputDriver>> drivers;
if (cvars::hid.compare("nop") == 0) {
drivers.emplace_back(xe::hid::nop::Create(window));
} else {
Factory<hid::InputDriver, ui::Window*> factory; Factory<hid::InputDriver, ui::Window*> factory;
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_WIN32
factory.Add("winkey", xe::hid::winkey::Create); factory.Add("winkey", xe::hid::winkey::Create);
factory.Add("xinput", xe::hid::xinput::Create); factory.Add("xinput", xe::hid::xinput::Create);
#endif // XE_PLATFORM_WIN32 #endif // XE_PLATFORM_WIN32
factory.Add("nop", xe::hid::nop::Create); for (auto& driver : factory.CreateAll(cvars::hid, window)) {
if (XSUCCEEDED(driver->Setup())) {
auto drivers = factory.CreateAll(cvars::hid, window); drivers.emplace_back(std::move(driver));
// Remove drivers that fail to setup.
for (auto it = drivers.begin(); it != drivers.end();) {
if (XFAILED((*it)->Setup())) {
it = drivers.erase(it);
} else {
++it;
} }
} }
if (drivers.empty()) { if (drivers.empty()) {
// Fallback to nop if none created. // Fallback to nop if none created.
drivers.emplace_back(xe::hid::nop::Create(window)); drivers.emplace_back(xe::hid::nop::Create(window));
} }
}
return drivers; return drivers;
} }