wiiu: update drivers for 2.32

Author: GaryOderNichts

src/joystick/wiiu/SDL_wiiujoystick.c

@@ -50,6 +50,8 @@ static int WIIU_JoystickInit(void);
 static int WIIU_JoystickGetCount(void);
 static void WIIU_JoystickDetect(void);
 static const char *WIIU_JoystickGetDeviceName(int device_index);
+static const char *WIIU_JoystickGetDevicePath(int device_index);
+static int WIIU_JoystickGetDeviceSteamVirtualGamepadSlot(int device_index);
 static int WIIU_JoystickGetDevicePlayerIndex(int device_index);
 static void WIIU_JoystickSetDevicePlayerIndex(int device_index, int player_index);
 static SDL_JoystickGUID WIIU_JoystickGetDeviceGUID(int device_index);
@@ -242,11 +244,16 @@ static const char *WIIU_JoystickGetDeviceName(int device_index)
 	return "Unknown";
 }
 
-static const char * WIIU_JoystickGetDevicePath(int device_index)
+static const char *WIIU_JoystickGetDevicePath(int device_index)
 {
     return NULL;
 }
 
+static int WIIU_JoystickGetDeviceSteamVirtualGamepadSlot(int device_index)
+{
+	return -1;
+}
+
 /* Function to get the player index of a joystick */
 static int WIIU_JoystickGetDevicePlayerIndex(int device_index)
 {
@@ -628,6 +635,7 @@ SDL_JoystickDriver SDL_WIIU_JoystickDriver =
 	WIIU_JoystickDetect,
 	WIIU_JoystickGetDeviceName,
 	WIIU_JoystickGetDevicePath,
+	WIIU_JoystickGetDeviceSteamVirtualGamepadSlot,
 	WIIU_JoystickGetDevicePlayerIndex,
 	WIIU_JoystickSetDevicePlayerIndex,
 	WIIU_JoystickGetDeviceGUID,

src/render/wiiu/SDL_render_wiiu.c

@@ -35,22 +35,13 @@
 
 #include <malloc.h>
 
-SDL_Renderer *WIIU_SDL_CreateRenderer(SDL_Window * window, Uint32 flags)
+int WIIU_SDL_CreateRenderer(SDL_Renderer * renderer, SDL_Window * window, Uint32 flags)
 {
-    SDL_Renderer *renderer;
     WIIU_RenderData *data;
 
-    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
-    if (!renderer) {
-        SDL_OutOfMemory();
-        return NULL;
-    }
-
     data = (WIIU_RenderData *) SDL_calloc(1, sizeof(*data));
     if (!data) {
-        SDL_free(renderer);
-        SDL_OutOfMemory();
-        return NULL;
+        return SDL_OutOfMemory();
     }
 
     /* Setup renderer functions */
@@ -113,7 +104,7 @@ SDL_Renderer *WIIU_SDL_CreateRenderer(SDL_Window * window, Uint32 flags)
     /* Setup colour buffer, rendering to the window */
     WIIU_SDL_SetRenderTarget(renderer, NULL);
 
-    return renderer;
+    return 0;
 }
 
 SDL_bool WIIU_SDL_SupportsBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode)

src/render/wiiu/SDL_render_wiiu.h

@@ -103,7 +103,7 @@ struct WIIU_TextureData
 #define WIIU_TEXTURE_MEM1_MAGIC (void *)0xCAFE0001
 
 /* SDL_render API implementation */
-SDL_Renderer *WIIU_SDL_CreateRenderer(SDL_Window * window, Uint32 flags);
+int WIIU_SDL_CreateRenderer(SDL_Renderer * renderer, SDL_Window * window, Uint32 flags);
 void WIIU_SDL_WindowEvent(SDL_Renderer * renderer,
                              const SDL_WindowEvent *event);
 SDL_bool WIIU_SDL_SupportsBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode);

src/video/SDL_video.c

@@ -142,12 +142,12 @@ static VideoBootStrap *bootstrap[] = {
 #ifdef SDL_VIDEO_DRIVER_NGAGE
     &NGAGE_bootstrap,
 #endif
-#ifdef SDL_VIDEO_DRIVER_OFFSCREEN
-    &OFFSCREEN_bootstrap,
-#endif
 #ifdef SDL_VIDEO_DRIVER_WIIU
     &WIIU_bootstrap,
 #endif
+#ifdef SDL_VIDEO_DRIVER_OFFSCREEN
+    &OFFSCREEN_bootstrap,
+#endif
 #ifdef SDL_VIDEO_DRIVER_DUMMY
     &DUMMY_bootstrap,
 #ifdef SDL_INPUT_LINUXEV