diff options
| author |  Morph | 2021-02-18 11:16:14 -0500 |
|---|---|---|
| committer |  GitHub | 2021-02-18 11:16:14 -0500 |
| commit | 1c550ff954df96970022cf603568cd8908fd9a7b (patch) | |
| tree | 89e625fa543ead175c3b722b5c30a19936629841 /src/input_common/sdl/sdl_impl.cpp | |
| parent | Merge pull request #5952 from ReinUsesLisp/cityhash (diff) | |
| download | yuzu-1c550ff954df96970022cf603568cd8908fd9a7b.tar.gz yuzu-1c550ff954df96970022cf603568cd8908fd9a7b.tar.xz yuzu-1c550ff954df96970022cf603568cd8908fd9a7b.zip | |
Revert "Port citra-emu/citra#5123: "SDL: Disable hidapi drivers due to compatibility problems with certain controllers""
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index a88ae452f..f67de37e3 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp | |||
| @@ -717,13 +717,6 @@ 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 | ||
| 727 | 720 | ||
| 728 | SDL_AddEventWatch(&SDLEventWatcher, this); | 721 | SDL_AddEventWatch(&SDLEventWatcher, this); |
| 729 | 722 | ||