Get surface_blit system compiling with SDL3

Author: Starbuck5

src_c/alphablit.c

@@ -1715,18 +1715,18 @@ premul_surf_color_by_alpha(SDL_Surface *src, SDL_Surface *dst)
 #if !defined(__EMSCRIPTEN__)
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
     if ((PG_SURF_BytesPerPixel(src) == 4) && pg_has_avx2()) {
-        premul_surf_color_by_alpha_avx2(src, dst);
+        premul_surf_color_by_alpha_avx2(src, src_format, dst);
         return 0;
     }
 #if defined(__SSE2__)
     if ((PG_SURF_BytesPerPixel(src) == 4) && SDL_HasSSE2()) {
-        premul_surf_color_by_alpha_sse2(src, dst);
+        premul_surf_color_by_alpha_sse2(src, src_format, dst);
         return 0;
     }
 #endif /* __SSE2__*/
 #if PG_ENABLE_ARM_NEON
     if ((PG_SURF_BytesPerPixel(src) == 4) && SDL_HasNEON()) {
-        premul_surf_color_by_alpha_sse2(src, dst);
+        premul_surf_color_by_alpha_sse2(src, src_format, dst);
         return 0;
     }
 #endif /* PG_ENABLE_ARM_NEON */

src_c/simd_blitters.h

@@ -55,7 +55,8 @@ premul_surf_color_by_alpha_non_simd(SDL_Surface *src,
                                     PG_PixelFormat *dst_format,
                                     SDL_Palette *dst_palette);
 void
-premul_surf_color_by_alpha_sse2(SDL_Surface *src, SDL_Surface *dst);
+premul_surf_color_by_alpha_sse2(SDL_Surface *src, PG_PixelFormat *srcfmt,
+                                SDL_Surface *dst);
 
 void
 alphablit_alpha_avx2_argb_no_surf_alpha_opaque_dst(SDL_BlitInfo *info);
@@ -86,4 +87,5 @@ blit_blend_rgb_min_avx2(SDL_BlitInfo *info);
 void
 blit_blend_premultiplied_avx2(SDL_BlitInfo *info);
 void
-premul_surf_color_by_alpha_avx2(SDL_Surface *src, SDL_Surface *dst);
+premul_surf_color_by_alpha_avx2(SDL_Surface *src, PG_PixelFormat *src_format,
+                                SDL_Surface *dst);

src_c/simd_blitters_avx2.c

@@ -1561,7 +1561,8 @@ blit_blend_premultiplied_avx2(SDL_BlitInfo *info)
 #if defined(__AVX2__) && defined(HAVE_IMMINTRIN_H) && \
     !defined(SDL_DISABLE_IMMINTRIN_H)
 void
-premul_surf_color_by_alpha_avx2(SDL_Surface *src, SDL_Surface *dst)
+premul_surf_color_by_alpha_avx2(SDL_Surface *src, PG_PixelFormat *src_format,
+                                SDL_Surface *dst)
 {
     int i, height = src->h;
     const int width = src->w;
@@ -1578,7 +1579,7 @@ premul_surf_color_by_alpha_avx2(SDL_Surface *src, SDL_Surface *dst)
     __m256i mm_src, mm_dst, alphaA, alphaB, mm_alpha_in;
     __m256i mm_srcA, mm_srcB;
 
-    const __m256i mm256_amask = _mm256_set1_epi32(src->format->Amask);
+    const __m256i mm256_amask = _mm256_set1_epi32(src_format->Amask);
     const __m256i mm_zero = _mm256_setzero_si256();
     const __m256i partial_mask =
         _mm256_set_epi32(0, pxl_excess > 6 ? -1 : 0, pxl_excess > 5 ? -1 : 0,
@@ -1587,10 +1588,10 @@ premul_surf_color_by_alpha_avx2(SDL_Surface *src, SDL_Surface *dst)
                          pxl_excess > 0 ? -1 : 0);
     const __m256i mm256_ones = _mm256_set1_epi16(0x0001);
 
-    char _a_off = ((src->format->Amask >> 8) == 0)    ? 0
-                  : ((src->format->Amask >> 16) == 0) ? 1
-                  : ((src->format->Amask >> 24) == 0) ? 2
-                                                      : 3;
+    char _a_off = ((src_format->Amask >> 8) == 0)    ? 0
+                  : ((src_format->Amask >> 16) == 0) ? 1
+                  : ((src_format->Amask >> 24) == 0) ? 2
+                                                     : 3;
 
     /* masks for shuffling the alpha to the RGB channels for multiplication */
     const __m256i shuffle_maskA = _mm256_set_epi8(
@@ -1637,7 +1638,8 @@ premul_surf_color_by_alpha_avx2(SDL_Surface *src, SDL_Surface *dst)
 }
 #else
 void
-premul_surf_color_by_alpha_avx2(SDL_Surface *src, SDL_Surface *dst)
+premul_surf_color_by_alpha_avx2(SDL_Surface *src, PG_PixelFormat *src_format,
+                                SDL_Surface *dst)
 {
     BAD_AVX2_FUNCTION_CALL;
 }

src_c/simd_blitters_sse2.c

@@ -151,8 +151,8 @@ alphablit_alpha_sse2_argb_surf_alpha(SDL_BlitInfo *info)
     Uint32 *dstp = (Uint32 *)info->d_pixels;
     int dstskip = info->d_skip >> 2;
 
-    SDL_PixelFormat *srcfmt = info->src;
-    SDL_PixelFormat *dstfmt = info->dst;
+    PG_PixelFormat *srcfmt = info->src;
+    PG_PixelFormat *dstfmt = info->dst;
 
     // int srcbpp = PG_FORMAT_BytesPerPixel(srcfmt);
     // int dstbpp = PG_FORMAT_BytesPerPixel(dstfmt);
@@ -293,8 +293,8 @@ alphablit_alpha_sse2_argb_no_surf_alpha(SDL_BlitInfo *info)
     int height = info->height;
     int srcskip = info->s_skip >> 2;
     int dstskip = info->d_skip >> 2;
-    SDL_PixelFormat *srcfmt = info->src;
-    SDL_PixelFormat *dstfmt = info->dst;
+    PG_PixelFormat *srcfmt = info->src;
+    PG_PixelFormat *dstfmt = info->dst;
 
     /* Original 'Straight Alpha' blending equation:
        --------------------------------------------
@@ -719,7 +719,7 @@ blit_blend_premultiplied_sse2(SDL_BlitInfo *info)
     int srcskip = info->s_skip >> 2;
     Uint32 *dstp = (Uint32 *)info->d_pixels;
     int dstskip = info->d_skip >> 2;
-    SDL_PixelFormat *srcfmt = info->src;
+    PG_PixelFormat *srcfmt = info->src;
     Uint32 amask = srcfmt->Amask;
     // Uint64 multmask;
     Uint64 ones;
@@ -787,15 +787,14 @@ blit_blend_premultiplied_sse2(SDL_BlitInfo *info)
 }
 
 void
-premul_surf_color_by_alpha_sse2(SDL_Surface *src, SDL_Surface *dst)
+premul_surf_color_by_alpha_sse2(SDL_Surface *src, PG_PixelFormat *srcfmt,
+                                SDL_Surface *dst)
 {
     int n;
     int width = src->w;
     int height = src->h;
     Uint32 *srcp = (Uint32 *)src->pixels;
     Uint32 *dstp = (Uint32 *)dst->pixels;
-
-    SDL_PixelFormat *srcfmt = src->format;
     Uint32 amask = srcfmt->Amask;
     Uint64 ones;