diff options
| author |  bunnei | 2021-02-15 16:25:53 -0800 |
|---|---|---|
| committer |  GitHub | 2021-02-15 16:25:53 -0800 |
| commit | 86212d4bcde58260c99b248f9cb9bce38327d918 (patch) | |
| tree | c356d2bac37277e510635f0f4d5e6f6e88cce784 /src/input_common/sdl/sdl_impl.cpp | |
| parent | Merge pull request #5923 from ReinUsesLisp/vk-dirty-pipeline (diff) | |
| parent | sdl_joystick: disable the use of the hidapi drivers due to many problems caus... (diff) | |
| download | yuzu-86212d4bcde58260c99b248f9cb9bce38327d918.tar.gz yuzu-86212d4bcde58260c99b248f9cb9bce38327d918.tar.xz yuzu-86212d4bcde58260c99b248f9cb9bce38327d918.zip | |
Merge pull request #3603 from FearlessTobi/port-5123
Port citra-emu/citra#5123: "SDL: Disable hidapi drivers due to compatibility problems with certain controllers"
Diffstat (limited to 'src/input_common/sdl/sdl_impl.cpp')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index f67de37e3..a88ae452f 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp | |||
| @@ -717,6 +717,13 @@ SDLState::SDLState() { | |||
| 717 | if (SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1") == SDL_FALSE) { | 717 | if (SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1") == SDL_FALSE) { |
| 718 | LOG_ERROR(Input, "Failed to set hint for background events with: {}", SDL_GetError()); | 718 | LOG_ERROR(Input, "Failed to set hint for background events with: {}", SDL_GetError()); |
| 719 | } | 719 | } |
| 720 | // these hints are only defined on sdl2.0.9 or higher | ||
| 721 | #if SDL_VERSION_ATLEAST(2, 0, 9) | ||
| 722 | #if !SDL_VERSION_ATLEAST(2, 0, 12) | ||
| 723 | // There are also hints to toggle the individual drivers if needed. | ||
| 724 | SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI, "0"); | ||
| 725 | #endif | ||
| 726 | #endif | ||
| 720 | 727 | ||
| 721 | SDL_AddEventWatch(&SDLEventWatcher, this); | 728 | SDL_AddEventWatch(&SDLEventWatcher, this); |
| 722 | 729 | ||