Merge pull request #3544 from Starbuck5/more-simple-sdl3-patches-2

Fix some Surface and Window tests on SDL3

Author: ankith26

src_c/_pygame.h

@@ -87,6 +87,8 @@
 #define PG_SoftStretchNearest(src, srcrect, dst, dstrect) \
     SDL_StretchSurface(src, srcrect, dst, dstrect, SDL_SCALEMODE_NEAREST)
 
+#define PG_UpdateWindowSurface SDL_UpdateWindowSurface
+
 /* Emulating SDL2 SDL_LockMutex API. In SDL3, it returns void. */
 static inline int
 PG_LockMutex(SDL_mutex *mutex)
@@ -198,6 +200,12 @@ PG_GetSurfaceFormat(SDL_Surface *surf)
 #define PG_SoftStretchNearest(src, srcrect, dst, dstrect) \
     SDL_SoftStretch(src, srcrect, dst, dstrect)
 
+static inline bool
+PG_UpdateWindowSurface(SDL_Window *window)
+{
+    return SDL_UpdateWindowSurface(window) == 0;
+}
+
 static inline int
 PG_LockMutex(SDL_mutex *mutex)
 {

src_c/display.c

@@ -1691,7 +1691,7 @@ static int
 pg_flip_internal(_DisplayState *state)
 {
     SDL_Window *win = pg_GetDefaultWindow();
-    int status = 0;
+    bool success = true;
 
     /* Same check as VIDEO_INIT_CHECK() but returns -1 instead of NULL on
      * fail. */
@@ -1729,12 +1729,12 @@ pg_flip_internal(_DisplayState *state)
             if (new_surface != ((pgSurfaceObject *)screen)->surf) {
                 screen->surf = new_surface;
             }
-            status = SDL_UpdateWindowSurface(win);
+            success = PG_UpdateWindowSurface(win);
         }
     }
     Py_END_ALLOW_THREADS;
 
-    if (status < 0) {
+    if (!success) {
         PyErr_SetString(pgExc_SDLError, SDL_GetError());
         return -1;
     }

src_c/surface.c

@@ -4564,7 +4564,11 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
             newfmt.Bloss = fmt->Bloss;
             src = PG_ConvertSurface(src, &newfmt);
             if (src) {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+                result = SDL_BlitSurface(src, srcrect, dst, dstrect) ? 0 : -1;
+#else
                 result = SDL_BlitSurface(src, srcrect, dst, dstrect);
+#endif
                 SDL_FreeSurface(src);
             }
             else {
@@ -4594,7 +4598,11 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
     }
     else {
         /* Py_BEGIN_ALLOW_THREADS */
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+        result = SDL_BlitSurface(src, srcrect, dst, dstrect) ? 0 : -1;
+#else
         result = SDL_BlitSurface(src, srcrect, dst, dstrect);
+#endif
         /* Py_END_ALLOW_THREADS */
     }
 

src_c/window.c

@@ -201,7 +201,7 @@ window_get_surface(pgWindowObject *self, PyObject *_null)
 static PyObject *
 window_flip(pgWindowObject *self, PyObject *_null)
 {
-    int result;
+    bool success;
 
     if (self->context == NULL) {
         if (!self->surf) {
@@ -211,9 +211,9 @@ window_flip(pgWindowObject *self, PyObject *_null)
         }
 
         Py_BEGIN_ALLOW_THREADS;
-        result = SDL_UpdateWindowSurface(self->_win);
+        success = PG_UpdateWindowSurface(self->_win);
         Py_END_ALLOW_THREADS;
-        if (result) {
+        if (!success) {
             return RAISE(pgExc_SDLError, SDL_GetError());
         }
     }
@@ -879,7 +879,12 @@ window_set_opacity(pgWindowObject *self, PyObject *arg, void *v)
     if (PyErr_Occurred()) {
         return -1;
     }
-    if (SDL_SetWindowOpacity(self->_win, opacity)) {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    if (!SDL_SetWindowOpacity(self->_win, opacity))
+#else
+    if (SDL_SetWindowOpacity(self->_win, opacity))
+#endif
+    {
         PyErr_SetString(pgExc_SDLError, SDL_GetError());
         return -1;
     }