switch: 2.28.5 fixups

Author: WinterMute

src/joystick/SDL_gamecontrollerdb.h

@@ -993,8 +993,7 @@ static const char *s_ControllerMappings[] = {
     "000000004e696e74656e646f20334400,Nintendo 3DS,crc:3210,a:b0,b:b1,back:b2,dpdown:b7,dpleft:b5,dpright:b4,dpup:b6,leftshoulder:b9,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b8,righttrigger:b15,rightx:a2,righty:a3,start:b3,x:b10,y:b11,",
 #endif
 #if defined(SDL_JOYSTICK_SWITCH)
-    "53776974636820436F6E74726F6C6C65,Switch Controller,a:b0,b:b1,back:b11,dpdown:b15,dpleft:b12,dpright:b14,dpup:b13,leftshoulder:b6,leftstick:b4,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:b9,rightx:a2,righty:a3,start:b10,x:b2,y:b3,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
-    "53776974636820436F6E74726F6C6C65,Switch Controller,a:b1,b:b0,back:b11,dpdown:b15,dpleft:b12,dpright:b14,dpup:b13,leftshoulder:b6,leftstick:b4,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:b9,rightx:a2,righty:a3,start:b10,x:b3,y:b2,hint:!SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
+    "53776974636820436F6E74726F6C6C65,Switch Controller,a:b1,b:b0,back:b11,dpdown:b15,dpleft:b12,dpright:b14,dpup:b13,leftshoulder:b6,leftstick:b4,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:b9,rightx:a2,righty:a3,start:b10,x:b3,y:b2,",
 #endif
     "hidapi,*,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
     NULL

src/joystick/SDL_joystick.c

@@ -84,9 +84,6 @@ static SDL_JoystickDriver *SDL_joystick_drivers[] = {
 #ifdef SDL_JOYSTICK_HAIKU
     &SDL_HAIKU_JoystickDriver,
 #endif
-#ifdef SDL_JOYSTICK_SWITCH
-    &SDL_SWITCH_JoystickDriver,
-#endif
 #ifdef SDL_JOYSTICK_USBHID /* !!! FIXME: "USBHID" is a generic name, and doubly-confusing with HIDAPI next to it. This is the *BSD interface, rename this. */
     &SDL_BSD_JoystickDriver,
 #endif
@@ -108,6 +105,9 @@ static SDL_JoystickDriver *SDL_joystick_drivers[] = {
 #ifdef SDL_JOYSTICK_N3DS
     &SDL_N3DS_JoystickDriver
 #endif
+#ifdef SDL_JOYSTICK_SWITCH
+    &SDL_SWITCH_JoystickDriver,
+#endif
 #if defined(SDL_JOYSTICK_DUMMY) || defined(SDL_JOYSTICK_DISABLED)
         &SDL_DUMMY_JoystickDriver
 #endif

src/joystick/switch/SDL_sysjoystick.c

@@ -247,8 +247,8 @@ static int SWITCH_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left, Ui
     return SDL_Unsupported();
 }
 
-static SDL_bool SWITCH_JoystickHasLED(SDL_Joystick *joystick) {
-    return SDL_FALSE;
+static Uint32 SWITCH_JoystickGetCapabilities(SDL_Joystick *joystick) {
+    return 0;
 }
 
 static int SWITCH_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue) {
@@ -336,6 +336,10 @@ static void SWITCH_JoystickClose(SDL_Joystick *joystick) {
 static void SWITCH_JoystickQuit(void) {
 }
 
+static SDL_bool SWITCH_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out) {
+    return SDL_FALSE;
+}
+
 SDL_JoystickDriver SDL_SWITCH_JoystickDriver = {
         SWITCH_JoystickInit,
         SWITCH_JoystickGetCount,
@@ -351,15 +355,17 @@ SDL_JoystickDriver SDL_SWITCH_JoystickDriver = {
 
         SWITCH_JoystickRumble,
         SWITCH_JoystickRumbleTriggers,
+        SWITCH_JoystickGetCapabilities,
 
-        SWITCH_JoystickHasLED,
         SWITCH_JoystickSetLED,
         SWITCH_JoystickSendEffect,
         SWITCH_JoystickSetSensorsEnabled,
 
         SWITCH_JoystickUpdate,
         SWITCH_JoystickClose,
         SWITCH_JoystickQuit,
+
+	    SWITCH_JoystickGetGamepadMapping,
 };
 
 #endif /* SDL_JOYSTICK_SWITCH */

src/video/SDL_video.c

@@ -205,7 +205,7 @@ typedef struct
 
 static Uint32 SDL_DefaultGraphicsBackends(SDL_VideoDevice *_this)
 {
-#if (SDL_VIDEO_OPENGL && __MACOSX__) || (__IPHONEOS__ && !TARGET_OS_MACCATALYST) || __ANDROID__ || __NACL__
+#if (SDL_VIDEO_OPENGL && __MACOSX__) || (__IPHONEOS__ && !TARGET_OS_MACCATALYST) || __ANDROID__ || __NACL__ || __SWITCH__
     if (_this->GL_CreateContext != NULL) {
         return SDL_WINDOW_OPENGL;
     }