Merge pull request #3314 from Starbuck5/transform-sdl3-a-bit

Move transform towards compiling w/ SDL3

Author: damusss

src_c/_pygame.h

@@ -130,6 +130,8 @@ PG_GetSurfaceFormat(SDL_Surface *surf)
     return SDL_GetPixelFormatDetails(surf->format);
 }
 
+#define PG_GetSurfacePalette SDL_GetSurfacePalette
+
 #define PG_GetRGBA SDL_GetRGBA
 #define PG_GetRGB SDL_GetRGB
 #define PG_MapRGBA SDL_MapRGBA
@@ -225,6 +227,12 @@ PG_GetSurfaceFormat(SDL_Surface *surf)
     return surf->format;
 }
 
+static inline SDL_Palette *
+PG_GetSurfacePalette(SDL_Surface *surf)
+{
+    return surf->format->palette;
+}
+
 // NOTE:
 // palette is part of the format in SDL2, so these functions below have it
 // as a separate parameter to be consistent with the SDL3 signature.

src_c/meson.build

@@ -134,7 +134,6 @@ surface = py.extension_module(
 )
 endif
 
-# TODO: support SDL3
 surflock = py.extension_module(
     'surflock',
     'surflock.c',

src_c/scale2x.c

@@ -73,7 +73,7 @@ scale2x(SDL_Surface *src, SDL_Surface *dst)
     const int height = src->h;
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-    const Uint8 Bpp = src->format->bytes_per_pixel;
+    const Uint8 Bpp = SDL_BYTESPERPIXEL(src->format);
 #else
     const Uint8 Bpp = src->format->BytesPerPixel;
 #endif