sdl3: Add to feature list

Author: RobLoach

input/drivers_joypad/sdl3_joypad.c

@@ -124,6 +124,7 @@ static void sdl3_joypad_connect(SDL_JoystickID jid)
       {
          SDL_CloseGamepad(pad->gamepad);
          pad->gamepad = NULL;
+         pad->joypad = NULL;
       }
       else if (pad->joypad)
       {
@@ -218,8 +219,8 @@ static void sdl3_joypad_destroy(void)
 
 static void *sdl3_joypad_init(void *data)
 {
-   int i, count                 = 0;
-   uint32_t sdl_subsystem_flags = SDL_WasInit(0);
+   int i, count = 0;
+   SDL_InitFlags sdl_subsystem_flags = SDL_WasInit(0);
 
    if (sdl_subsystem_flags == 0)
    {
@@ -412,18 +413,12 @@ static void sdl3_joypad_poll(void)
 static bool sdl3_joypad_set_rumble(unsigned pad,
       enum retro_rumble_effect effect, uint16_t strength)
 {
-   sdl3_joypad_t *joypad;
    uint16_t low  = 0;
    uint16_t high = 0;
 
    if (pad >= MAX_USERS)
       return false;
 
-   joypad = (sdl3_joypad_t*)&sdl3_joypads[pad];
-
-   if (!joypad->joypad)
-      return false;
-
    switch (effect)
    {
       case RETRO_RUMBLE_STRONG:
@@ -436,9 +431,12 @@ static bool sdl3_joypad_set_rumble(unsigned pad,
          return false;
    }
 
-   if (joypad->gamepad)
-      return SDL_RumbleGamepad(joypad->gamepad, low, high, 5000);
-   return SDL_RumbleJoystick(joypad->joypad, low, high, 5000);
+   if (sdl3_joypads[pad].gamepad)
+      return SDL_RumbleGamepad(sdl3_joypads[pad].gamepad, low, high, 5000);
+   else if (sdl3_joypads[pad].joypad)
+      return SDL_RumbleJoystick(sdl3_joypads[pad].joypad, low, high, 5000);
+
+   return false;
 }
 
 /**

input/input_autodetect_builtin.c

@@ -32,11 +32,16 @@
 #include <wiiu/pad_strings.h>
 #endif
 
+#ifdef HAVE_SDL3
+#include <SDL3/SDL.h>
+#endif
+
 #define DECL_BTN(btn, bind) "input_" #btn "_btn = " #bind "\n"
 #define DECL_BTN_EX(btn, bind, name) "input_" #btn "_btn = " #bind "\ninput_" #btn "_btn_label = \"" name "\"\n"
 #define DECL_AXIS(axis, bind) "input_" #axis "_axis = " #bind "\n"
 #define DECL_AXIS_EX(axis, bind, name) "input_" #axis "_axis = " #bind "\ninput_" #axis "_axis_label = \"" name "\"\n"
 #define DECL_MENU(btn) "input_menu_toggle_btn = " #btn "\n"
+#define DECL_MENU_EX(btn, name) "input_menu_toggle_btn = " #btn "\ninput_menu_toggle_btn_label = \"" name "\"\n"
 #define DECL_AUTOCONF_DEVICE(device, driver, binds) "input_device = \"" device "\"\ninput_driver = \"" driver "\"\n" binds
 #define DECL_AUTOCONF_PID(pid, vid, driver, binds) "input_product_id = " #pid "\ninput_vendor_id = " #vid "\ninput_driver = \"" driver "\"\n" binds
 
@@ -66,6 +71,33 @@ DECL_AXIS(r_x_minus, -2) \
 DECL_AXIS(r_y_plus,  -3) \
 DECL_AXIS(r_y_minus, +3)
 
+#define SDL3_DEFAULT_BINDS \
+DECL_BTN_EX(a,          SDL_GAMEPAD_BUTTON_EAST, "Right Face Button") \
+DECL_BTN_EX(b,          SDL_GAMEPAD_BUTTON_SOUTH, "Bottom Face Button") \
+DECL_BTN_EX(x,          SDL_GAMEPAD_BUTTON_NORTH, "Top Face Button") \
+DECL_BTN_EX(y,          SDL_GAMEPAD_BUTTON_WEST, "Left Face Button") \
+DECL_BTN_EX(select,     SDL_GAMEPAD_BUTTON_BACK, "Back") \
+DECL_BTN_EX(start,      SDL_GAMEPAD_BUTTON_START, "Start") \
+DECL_BTN_EX(up,         SDL_GAMEPAD_BUTTON_DPAD_UP, "D-Pad Up") \
+DECL_BTN_EX(down,       SDL_GAMEPAD_BUTTON_DPAD_DOWN, "D-Pad Down") \
+DECL_BTN_EX(left,       SDL_GAMEPAD_BUTTON_DPAD_LEFT, "D-Pad Left") \
+DECL_BTN_EX(right,      SDL_GAMEPAD_BUTTON_DPAD_RIGHT, "D-Pad Right") \
+DECL_BTN_EX(l,          SDL_GAMEPAD_BUTTON_LEFT_SHOULDER, "Left Shoulder") \
+DECL_BTN_EX(r,          SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER, "Right Shoulder") \
+DECL_AXIS_EX(l2,        +SDL_GAMEPAD_AXIS_LEFT_TRIGGER, "Left Trigger") \
+DECL_AXIS_EX(r2,        +SDL_GAMEPAD_AXIS_RIGHT_TRIGGER, "Right Trigger") \
+DECL_BTN_EX(l3,         SDL_GAMEPAD_BUTTON_LEFT_STICK, "Left Stick") \
+DECL_BTN_EX(r3,         SDL_GAMEPAD_BUTTON_RIGHT_STICK, "Right Stick") \
+DECL_AXIS_EX(l_x_plus,  +SDL_GAMEPAD_AXIS_LEFTX, "Left Thumbstick X+") \
+DECL_AXIS_EX(l_x_minus, -SDL_GAMEPAD_AXIS_LEFTX, "Left Thumbstick X-") \
+DECL_AXIS_EX(l_y_plus,  +SDL_GAMEPAD_AXIS_LEFTY, "Left Thumbstick Y+") \
+DECL_AXIS_EX(l_y_minus, -SDL_GAMEPAD_AXIS_LEFTY, "Left Thumbstick Y-") \
+DECL_AXIS_EX(r_x_plus,  +SDL_GAMEPAD_AXIS_RIGHTX, "Right Thumbstick X+") \
+DECL_AXIS_EX(r_x_minus, -SDL_GAMEPAD_AXIS_RIGHTX, "Right Thumbstick X-") \
+DECL_AXIS_EX(r_y_plus,  -SDL_GAMEPAD_AXIS_RIGHTY, "Right Thumbstick Y+") \
+DECL_AXIS_EX(r_y_minus, +SDL_GAMEPAD_AXIS_RIGHTY, "Right Thumbstick Y-") \
+DECL_MENU_EX(SDL_GAMEPAD_BUTTON_GUIDE, "Guide")
+
 #if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
 #define DINGUX_SDL_DEFAULT_BINDS \
 DECL_BTN_EX(a,           8, "A") \
@@ -721,7 +753,7 @@ const char* const input_builtin_autoconfs[] =
    DECL_AUTOCONF_DEVICE("Standard Gamepad", "sdl2", SDL2_DEFAULT_BINDS),
 #endif
 #ifdef HAVE_SDL3
-   DECL_AUTOCONF_DEVICE("Standard Gamepad", "sdl3", SDL2_DEFAULT_BINDS),
+   DECL_AUTOCONF_DEVICE("Gamepad", "sdl3", SDL3_DEFAULT_BINDS),
 #endif
 #if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
    DECL_AUTOCONF_DEVICE("Dingux Gamepad", "sdl_dingux", DINGUX_SDL_DEFAULT_BINDS),

menu/menu_displaylist.c

@@ -408,7 +408,7 @@ static int filebrowser_parse(
                   ? FILE_TYPE_VIDEO_FONT
                   : (enum msg_file_type)type_default;
 
-            if (   type == DISPLAYLIST_CORES_DETECTED 
+            if (   type == DISPLAYLIST_CORES_DETECTED
                 && path_is_compressed_file(file_path))
                file_type = FILE_TYPE_CARCHIVE;
             break;
@@ -631,7 +631,7 @@ static int menu_displaylist_parse_core_info(
          core_info = core_info_menu;
    }
 
-   if (   !core_info 
+   if (   !core_info
        || !(core_info->flags & CORE_INFO_FLAG_HAS_INFO))
    {
       if (menu_entries_append(list,
@@ -2390,6 +2390,9 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
 #ifdef HAVE_SDL2
          {SUPPORTS_SDL2, "SDL 2"},
 #endif
+#ifdef HAVE_SDL3
+         {SUPPORTS_SDL3, "SDL 3"},
+#endif
 #ifdef HAVE_X11
          {SUPPORTS_X11, "X11"},
 #endif
@@ -5059,7 +5062,7 @@ static unsigned menu_displaylist_parse_content_information(
 
       if (core_info_find(core_path, &core_info))
       {
-         core_supports_no_game = (core_info->flags 
+         core_supports_no_game = (core_info->flags
                                 & CORE_INFO_FLAG_SUPPORTS_NO_GAME);
          if (!string_is_empty(core_info->display_name))
             strlcpy(core_name, core_info->display_name, sizeof(core_name));
@@ -10084,7 +10087,7 @@ unsigned menu_displaylist_build_list(
                            MENU_ENUM_LABEL_VIDEO_HDR_SCANLINES,
                            PARSE_ONLY_BOOL, false) == 0)
                      count++;
-                     
+
                   if(settings->bools.video_hdr_scanlines)
                   {
                      if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,

retroarch.c

@@ -6466,6 +6466,9 @@ static void retroarch_print_features(void)
 #ifdef HAVE_SDL2
    _len += _PSUPP_BUF(buf, _len, SUPPORTS_SDL2,            "SDL2",            "SDL2 input/audio/video drivers");
 #endif
+#ifdef HAVE_SDL3
+   _len += _PSUPP_BUF(buf, _len, SUPPORTS_SDL3,            "SDL3",            "SDL3 joypad driver");
+#endif
 #ifdef HAVE_X11
    _len += _PSUPP_BUF(buf, _len, SUPPORTS_X11,             "X11",             "X11 input/video drivers");
 #endif