diff --git a/rpcs3/Input/sdl_instance.cpp b/rpcs3/Input/sdl_instance.cpp index a27a8e40de..680e058515 100644 --- a/rpcs3/Input/sdl_instance.cpp +++ b/rpcs3/Input/sdl_instance.cpp @@ -96,6 +96,9 @@ bool sdl_instance::initialize() case SDL_LOG_CATEGORY_TEST: category_name = "test"; break; + case SDL_LOG_CATEGORY_GPU: + category_name = "gpu"; + break; default: category_name = fmt::format("unknown(%d)", category); break; diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp index 244cd6006a..a729c5516e 100644 --- a/rpcs3/Input/sdl_pad_handler.cpp +++ b/rpcs3/Input/sdl_pad_handler.cpp @@ -32,6 +32,11 @@ sdl_pad_handler::sdl_pad_handler() : PadHandlerBase(pad_handler::sdl) { SDLKeyCodes::RS, "RS" }, { SDLKeyCodes::Guide, "Guide" }, { SDLKeyCodes::Misc1, "Misc 1" }, + { SDLKeyCodes::Misc2, "Misc 2" }, + { SDLKeyCodes::Misc3, "Misc 3" }, + { SDLKeyCodes::Misc4, "Misc 4" }, + { SDLKeyCodes::Misc5, "Misc 5" }, + { SDLKeyCodes::Misc6, "Misc 6" }, { SDLKeyCodes::RPaddle1, "R Paddle 1" }, { SDLKeyCodes::LPaddle1, "L Paddle 1" }, { SDLKeyCodes::RPaddle2, "R Paddle 2" }, @@ -1006,6 +1011,11 @@ sdl_pad_handler::SDLKeyCodes sdl_pad_handler::get_button_code(SDL_GamepadButton case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_STICK: return SDLKeyCodes::RS; case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_GUIDE: return SDLKeyCodes::Guide; case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC1: return SDLKeyCodes::Misc1; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC2: return SDLKeyCodes::Misc2; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC3: return SDLKeyCodes::Misc3; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC4: return SDLKeyCodes::Misc4; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC5: return SDLKeyCodes::Misc5; + case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_MISC6: return SDLKeyCodes::Misc6; case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_PADDLE1: return SDLKeyCodes::RPaddle1; case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_LEFT_PADDLE1: return SDLKeyCodes::LPaddle1; case SDL_GamepadButton::SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2: return SDLKeyCodes::RPaddle2; diff --git a/rpcs3/Input/sdl_pad_handler.h b/rpcs3/Input/sdl_pad_handler.h index 1e8dff73f2..408c4a2fae 100644 --- a/rpcs3/Input/sdl_pad_handler.h +++ b/rpcs3/Input/sdl_pad_handler.h @@ -98,6 +98,11 @@ class sdl_pad_handler : public PadHandlerBase Back, Guide, Misc1, + Misc2, + Misc3, + Misc4, + Misc5, + Misc6, RPaddle1, LPaddle1, RPaddle2,