[Input] Dynamically link to XInput.

2018-11-22 10:46:48 -06:00
parent 86d2c9ae1e
commit 086d7e9da7
4 changed files with 76 additions and 19 deletions
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -119,11 +119,18 @@ std::vector<std::unique_ptr<hid::InputDriver>> CreateInputDrivers(
      drivers.emplace_back(std::move(winkey_driver));
    }
 #endif  // XE_PLATFORM_WIN32
-    if (drivers.empty()) {
-      // Fallback to nop if none created.
-      drivers.emplace_back(xe::hid::nop::Create(window));
+  }
+  for (auto it = drivers.begin(); it != drivers.end();) {
+    if (XFAILED((*it)->Setup())) {
+      it = drivers.erase(it);
+    } else {
+      ++it;
    }
  }
+  if (drivers.empty()) {
+    // Fallback to nop if none created.
+    drivers.emplace_back(xe::hid::nop::Create(window));
+  }
  return drivers;
 }