Merge pull request #3509 from MightyJosip/sdl3-init

Fix init functions with SDL3 build

Author: ankith26

src_c/_pygame.h

@@ -151,6 +151,7 @@ PG_GetSurfaceFormat(SDL_Surface *surf)
 #define PG_EventEnabled(type) SDL_EventEnabled(type)
 #define PG_SetJoystickEventsEnabled(enabled) \
     SDL_SetJoystickEventsEnabled(enabled)
+#define PG_InitSubSystem(flags) SDL_InitSubSystem(flags)
 
 #define PG_FIND_VNUM_MAJOR(ver) SDL_VERSIONNUM_MAJOR(ver)
 #define PG_FIND_VNUM_MINOR(ver) SDL_VERSIONNUM_MINOR(ver)
@@ -316,6 +317,12 @@ PG_MapRGB(PG_PixelFormat *format, const SDL_Palette *palette, Uint8 r, Uint8 g,
     return SDL_MapRGB(format, r, g, b);
 }
 
+static inline bool
+PG_InitSubSystem(Uint32 flags)
+{
+    return SDL_InitSubSystem(flags) == 0;
+}
+
 /* Mask to test if surface flags are in a fullscreen window.
  * SDL_WINDOW_FULLSCREEN_DESKTOP works here because it also contains
  * SDL_WINDOW_FULLSCREEN. */

src_c/_sdl2/controller.c

@@ -26,7 +26,7 @@ static PyObject *
 controller_module_init(PyObject *module, PyObject *_null)
 {
     if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER)) {
-        if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER)) {
+        if (!PG_InitSubSystem(SDL_INIT_GAMECONTROLLER)) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
     }

src_c/base.c

@@ -78,7 +78,7 @@ static PyObject *pgExc_BufferError = NULL;
 /* Only one instance of the state per process. */
 static PyObject *pg_quit_functions = NULL;
 static int pg_is_init = 0;
-static int pg_sdl_was_init = 0;
+static bool pg_sdl_was_init = 0;
 SDL_Window *pg_default_window = NULL;
 pgSurfaceObject *pg_default_screen = NULL;
 static int pg_env_blend_alpha_SDL2 = 0;
@@ -348,10 +348,10 @@ pg_init(PyObject *self, PyObject *_null)
 
     /*nice to initialize timer, so startup time will reflec pg_init() time*/
 #if defined(WITH_THREAD) && !defined(MS_WIN32) && defined(SDL_INIT_EVENTTHREAD)
-    pg_sdl_was_init = SDL_Init(SDL_INIT_EVENTTHREAD | PG_INIT_TIMER |
-                               PG_INIT_NOPARACHUTE) == 0;
+    pg_sdl_was_init = PG_InitSubSystem(SDL_INIT_EVENTTHREAD | PG_INIT_TIMER |
+                                       PG_INIT_NOPARACHUTE);
 #else
-    pg_sdl_was_init = SDL_Init(PG_INIT_TIMER | PG_INIT_NOPARACHUTE) == 0;
+    pg_sdl_was_init = PG_InitSubSystem(PG_INIT_TIMER | PG_INIT_NOPARACHUTE);
 #endif
 
     pg_env_blend_alpha_SDL2 = SDL_getenv("PYGAME_BLEND_ALPHA_SDL2") != NULL;
@@ -382,7 +382,7 @@ pg_atexit_quit(void)
        successful SDL_Init.
     */
     if (pg_sdl_was_init) {
-        pg_sdl_was_init = 0;
+        pg_sdl_was_init = false;
         SDL_Quit();
     }
 }

src_c/display.c

@@ -242,7 +242,7 @@ pg_display_init(PyObject *self, PyObject *_null)
             return NULL;
         }
 
-        if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
+        if (!PG_InitSubSystem(SDL_INIT_VIDEO)) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
     }

src_c/joystick.c

@@ -39,7 +39,7 @@ static PyObject *
 init(PyObject *self, PyObject *_null)
 {
     if (!SDL_WasInit(SDL_INIT_JOYSTICK)) {
-        if (SDL_InitSubSystem(SDL_INIT_JOYSTICK)) {
+        if (!PG_InitSubSystem(SDL_INIT_JOYSTICK)) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
         PG_SetJoystickEventsEnabled(SDL_TRUE);

src_c/mixer.c

@@ -444,7 +444,7 @@ _init(int freq, int size, int channels, int chunk, char *devicename,
             SDL_setenv("SDL_AUDIODRIVER", "directsound", 1);
         }
 
-        if (SDL_InitSubSystem(SDL_INIT_AUDIO)) {
+        if (!PG_InitSubSystem(SDL_INIT_AUDIO)) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
 

src_c/time.c

@@ -325,7 +325,7 @@ accurate_delay(Sint64 ticks)
 
 #if !SDL_VERSION_ATLEAST(3, 0, 0)
     if (!SDL_WasInit(SDL_INIT_TIMER)) {
-        if (SDL_InitSubSystem(SDL_INIT_TIMER)) {
+        if (!PG_InitSubSystem(SDL_INIT_TIMER)) {
             PyErr_SetString(pgExc_SDLError, SDL_GetError());
             return -1;
         }
@@ -389,7 +389,7 @@ time_wait(PyObject *self, PyObject *arg)
 
 #if !SDL_VERSION_ATLEAST(3, 0, 0)
     if (!SDL_WasInit(SDL_INIT_TIMER)) {
-        if (SDL_InitSubSystem(SDL_INIT_TIMER)) {
+        if (!PG_InitSubSystem(SDL_INIT_TIMER)) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
     }
@@ -479,7 +479,7 @@ time_set_timer(PyObject *self, PyObject *args, PyObject *kwargs)
 #if !SDL_VERSION_ATLEAST(3, 0, 0)
     /* just doublecheck that timer is initialized */
     if (!SDL_WasInit(SDL_INIT_TIMER)) {
-        if (SDL_InitSubSystem(SDL_INIT_TIMER)) {
+        if (!PG_InitSubSystem(SDL_INIT_TIMER)) {
             ecode = PG_TIMER_SDL_ERROR;
             goto end;
         }
@@ -549,7 +549,7 @@ clock_tick_base(pgClockObject *self, PyObject *arg, int use_accurate_delay)
 #if !SDL_VERSION_ATLEAST(3, 0, 0)
         /*just doublecheck that timer is initialized*/
         if (!SDL_WasInit(SDL_INIT_TIMER)) {
-            if (SDL_InitSubSystem(SDL_INIT_TIMER)) {
+            if (!PG_InitSubSystem(SDL_INIT_TIMER)) {
                 return RAISE(pgExc_SDLError, SDL_GetError());
             }
         }
@@ -671,7 +671,7 @@ clock_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 
 #if !SDL_VERSION_ATLEAST(3, 0, 0)
     if (!SDL_WasInit(SDL_INIT_TIMER)) {
-        if (SDL_InitSubSystem(SDL_INIT_TIMER)) {
+        if (!PG_InitSubSystem(SDL_INIT_TIMER)) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
     }