Get surface.c compiling in SDL3

Author: Starbuck5

src_c/meson.build

@@ -84,8 +84,6 @@ rwobject = py.extension_module(
     subdir: pg,
 )
 
-# TODO: support SDL3
-if sdl_api != 3
 simd_blitters_avx2 = static_library(
     'simd_blitters_avx2',
     'simd_blitters_avx2.c',
@@ -132,7 +130,6 @@ surface = py.extension_module(
     install: true,
     subdir: pg,
 )
-endif
 
 surflock = py.extension_module(
     'surflock',

src_c/surface.c

@@ -1546,7 +1546,12 @@ surf_set_alpha(pgSurfaceObject *self, PyObject *args)
     bool success =
         PG_SetSurfaceRLE(surf, (flags & PGS_RLEACCEL) ? SDL_TRUE : SDL_FALSE);
     /* HACK HACK HACK */
-    if ((surf->flags & SDL_RLEACCEL) && (!(flags & PGS_RLEACCEL))) {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    if (SDL_SurfaceHasRLE(surf) && (!(flags & PGS_RLEACCEL)))
+#else
+    if ((surf->flags & SDL_RLEACCEL) && (!(flags & PGS_RLEACCEL)))
+#endif
+    {
         /* hack to strip SDL_RLEACCEL flag off surface immediately when
            it is not requested */
         sdlrect.x = 0;
@@ -3016,9 +3021,15 @@ surf_get_flags(PyObject *self, PyObject *_null)
     if (PG_SurfaceHasRLE(surf)) {
         flags |= PGS_RLEACCELOK;
     }
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    if (SDL_SurfaceHasRLE(surf)) {
+        flags |= PGS_RLEACCEL;
+    }
+#else
     if ((sdl_flags & SDL_RLEACCEL)) {
         flags |= PGS_RLEACCEL;
     }
+#endif
     if (is_window_surf) {
         if (window_flags & PG_WINDOW_FULLSCREEN_INCLUSIVE) {
             flags |= PGS_FULLSCREEN;
@@ -4370,8 +4381,8 @@ surf_get_pixels_address(PyObject *self, PyObject *closure)
 }
 
 static int
-surface_do_overlap(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
-                   SDL_Rect *dstrect)
+surface_do_overlap(SDL_Surface *src, SDL_Rect *srcrect, SDL_Rect *srcclip,
+                   SDL_Surface *dst, SDL_Rect *dstrect)
 {
     Uint8 *srcpixels;
     Uint8 *dstpixels;
@@ -4380,7 +4391,6 @@ surface_do_overlap(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
     int x, y;
     int w = srcrect->w, h = srcrect->h;
     int maxw, maxh;
-    SDL_Rect *clip = &dst->clip_rect;
     int span;
     int dstoffset;
 
@@ -4406,23 +4416,23 @@ surface_do_overlap(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
     }
 
     /* clip the destination rectangle against the clip rectangle */
-    x = clip->x - dstx;
+    x = srcclip->x - dstx;
     if (x > 0) {
         w -= x;
         dstx += x;
         srcx += x;
     }
-    x = dstx + w - clip->x - clip->w;
+    x = dstx + w - srcclip->x - srcclip->w;
     if (x > 0) {
         w -= x;
     }
-    y = clip->y - dsty;
+    y = srcclip->y - dsty;
     if (y > 0) {
         h -= y;
         dsty += y;
         srcy += y;
     }
-    y = dsty + h - clip->y - clip->h;
+    y = dsty + h - srcclip->y - srcclip->h;
     if (y > 0) {
         h -= y;
     }
@@ -4460,8 +4470,15 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
     SDL_Surface *dst = pgSurface_AsSurface(dstobj);
     SDL_Surface *subsurface = NULL;
     int result, suboffsetx = 0, suboffsety = 0;
-    SDL_Rect orig_clip, sub_clip;
+    SDL_Rect orig_clip, sub_clip, srcclip;
+#if !SDL_VERSION_ATLEAST(3, 0, 0)
     Uint8 alpha;
+#endif
+
+    if (!PG_GetSurfaceClipRect(src, &srcclip)) {
+        PyErr_SetString(pgExc_SDLError, SDL_GetError());
+        return 0;
+    }
 
     /* passthrough blits to the real surface */
     if (((pgSurfaceObject *)dstobj)->subsurface) {
@@ -4506,11 +4523,13 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
             owner is locked.
             */
          dst->pixels == src->pixels && srcrect != NULL &&
-         surface_do_overlap(src, srcrect, dst, dstrect))) {
+         surface_do_overlap(src, srcrect, &srcclip, dst, dstrect))) {
         /* Py_BEGIN_ALLOW_THREADS */
         result = pygame_Blit(src, srcrect, dst, dstrect, blend_flags);
         /* Py_END_ALLOW_THREADS */
     }
+// TODO SDL3: port the below bit of code. Skipping for initial surface port.
+#if !SDL_VERSION_ATLEAST(3, 0, 0)
     /* can't blit alpha to 8bit, crashes SDL */
     else if (PG_SURF_BytesPerPixel(dst) == 1 &&
              (SDL_ISPIXELFORMAT_ALPHA(PG_SURF_FORMATENUM(src)) ||
@@ -4554,14 +4573,20 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj,
         }
         /* Py_END_ALLOW_THREADS */
     }
+#endif
     else if (blend_flags != PYGAME_BLEND_ALPHA_SDL2 &&
              !(pg_EnvShouldBlendAlphaSDL2()) && !SDL_HasColorKey(src) &&
              (PG_SURF_BytesPerPixel(dst) == 4 ||
               PG_SURF_BytesPerPixel(dst) == 2) &&
              _PgSurface_SrcAlpha(src) &&
              (SDL_ISPIXELFORMAT_ALPHA(PG_SURF_FORMATENUM(src))) &&
              !PG_SurfaceHasRLE(src) && !PG_SurfaceHasRLE(dst) &&
-             !(src->flags & SDL_RLEACCEL) && !(dst->flags & SDL_RLEACCEL)) {
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+             1
+#else
+             !(src->flags & SDL_RLEACCEL) && !(dst->flags & SDL_RLEACCEL)
+#endif
+    ) {
         /* If we have a 32bit source surface with per pixel alpha
            and no RLE we'll use pygame_Blit so we can mimic how SDL1
             behaved */