summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2021-12-14 17:12:17 +0100
committerGitHub <noreply@github.com>2021-12-14 17:12:17 +0100
commitac0c5be7c04527bd12058ea6b8b7c6e594571a0c (patch)
tree087a8b1cb7131302075d87b8155e0e070d16ca90
parentMerge pull request #7580 from lioncash/input-doc (diff)
parentinput/SDL: Update SDL hints (diff)
downloadyuzu-ac0c5be7c04527bd12058ea6b8b7c6e594571a0c.tar
yuzu-ac0c5be7c04527bd12058ea6b8b7c6e594571a0c.tar.gz
yuzu-ac0c5be7c04527bd12058ea6b8b7c6e594571a0c.tar.bz2
yuzu-ac0c5be7c04527bd12058ea6b8b7c6e594571a0c.tar.lz
yuzu-ac0c5be7c04527bd12058ea6b8b7c6e594571a0c.tar.xz
yuzu-ac0c5be7c04527bd12058ea6b8b7c6e594571a0c.tar.zst
yuzu-ac0c5be7c04527bd12058ea6b8b7c6e594571a0c.zip
-rw-r--r--src/input_common/drivers/sdl_driver.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index e33a5ff31..0cda9df62 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -403,10 +403,11 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
// Use hidapi driver for joycons. This will allow joycons to be detected as a GameController and
// not a generic one
- SDL_SetHint("SDL_JOYSTICK_HIDAPI_JOY_CONS", "1");
+ SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1");
- // Turn off Pro controller home led
- SDL_SetHint("SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED", "0");
+ // Disable hidapi driver for xbox. Already default on Windows, this causes conflict with native
+ // driver on Linux.
+ SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_XBOX, "0");
// If the frontend is going to manage the event loop, then we don't start one here
start_thread = SDL_WasInit(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) == 0;