diff options
| author | 2023-07-07 21:59:47 +0200 | |
|---|---|---|
| committer | 2023-07-07 21:59:47 +0200 | |
| commit | aa882cdaa84dedc5ad4187f36dca08bb86e67c4e (patch) | |
| tree | 0d159d2a34635e5b75da66f4222865f5bf34f8fd /src/input_common/drivers/sdl_driver.h | |
| parent | Merge pull request #11041 from Morph1984/vksdk (diff) | |
| download | yuzu-aa882cdaa84dedc5ad4187f36dca08bb86e67c4e.tar.gz yuzu-aa882cdaa84dedc5ad4187f36dca08bb86e67c4e.tar.xz yuzu-aa882cdaa84dedc5ad4187f36dca08bb86e67c4e.zip | |
input_common: set `SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS` to 0
This allows to share the mappings between Nintendo and non-Nintendo controllers.
Breaks the controller configuration for existing users who are using a Nintendo controller.
(Documentation of the hint https://github.com/libsdl-org/SDL/blob/92b3c53c92971e685254fd89f89ce6bde8cea60e/include/SDL_hints.h#L512-L532)
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/drivers/sdl_driver.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h index ffde169b3..fcba4e3c6 100644 --- a/src/input_common/drivers/sdl_driver.h +++ b/src/input_common/drivers/sdl_driver.h | |||
| @@ -100,11 +100,8 @@ private: | |||
| 100 | int axis_y, float offset_x, | 100 | int axis_y, float offset_x, |
| 101 | float offset_y) const; | 101 | float offset_y) const; |
| 102 | 102 | ||
| 103 | /// Returns the default button bindings list for generic controllers | 103 | /// Returns the default button bindings list |
| 104 | ButtonBindings GetDefaultButtonBinding() const; | 104 | ButtonBindings GetDefaultButtonBinding(const std::shared_ptr<SDLJoystick>& joystick) const; |
| 105 | |||
| 106 | /// Returns the default button bindings list for nintendo controllers | ||
| 107 | ButtonBindings GetNintendoButtonBinding(const std::shared_ptr<SDLJoystick>& joystick) const; | ||
| 108 | 105 | ||
| 109 | /// Returns the button mappings from a single controller | 106 | /// Returns the button mappings from a single controller |
| 110 | ButtonMapping GetSingleControllerMapping(const std::shared_ptr<SDLJoystick>& joystick, | 107 | ButtonMapping GetSingleControllerMapping(const std::shared_ptr<SDLJoystick>& joystick, |