Fix to respect clip rect. Removed unused includes from pygame.h.

Author: itzpr3d4t0r

src/data_block.c

@@ -190,6 +190,10 @@ calculate_fragmentation_map(pgSurfaceObject *dest, DataBlock *block)
             destination->pixels = dest_pixels + clipped.y * dest_skip + clipped.x;
             destination->width = clipped.w;
             destination->rows = clipped.h;
+            destination->src_offset =
+                (src_rect.x < dest_clip->x ? dest_clip->x - src_rect.x : 0) +
+                (src_rect.y < dest_clip->y ? dest_clip->y - src_rect.y : 0) *
+                    src_surf->pitch / 4;
         }
 
         positions_x += length;
@@ -234,7 +238,7 @@ blit_fragments_blitcopy(FragmentationMap *frag_map, pgSurfaceObject *dest,
         for (int j = 0; j < fragment->length; j++) {
             BlitDestination *item = &destinations[j];
 
-            uint32_t *srcp32 = src_start;
+            uint32_t *srcp32 = src_start + item->src_offset;
             uint32_t *dstp32 = item->pixels;
 
             if (item->width == 1 && item->rows == 1) {
@@ -367,17 +371,17 @@ blit_fragments_add_scalar(FragmentationMap *frag_map, PyObject **animation,
         Fragment *fragment = &fragments[i];
         SDL_Surface *src_surf =
             ((pgSurfaceObject *)animation[fragment->animation_index])->surf;
-        const int src_skip = src_surf->pitch - src_surf->w * 4;
         uint8_t *const src_start = (uint8_t *)src_surf->pixels;
 
         for (int j = 0; j < fragment->length; j++) {
             BlitDestination *item = &destinations[j];
 
-            uint8_t *srcp8 = src_start;
+            uint8_t *srcp8 = src_start + item->src_offset * 4;
             uint8_t *dstp8 = (uint8_t *)item->pixels;
+            const int actual_dst_skip = 4 * (dst_skip - item->width);
+            const int src_skip = src_surf->pitch - item->width * 4;
 
             int h = item->rows;
-            const int actual_dst_skip = 4 * (dst_skip - item->width);
 
             while (h--) {
                 for (int k = 0; k < item->width; k++) {

src/include/data_block.h

@@ -26,7 +26,7 @@ typedef struct {
 
 typedef struct {
     uint32_t *pixels;
-    int width, rows;
+    int width, rows, src_offset;
 } BlitDestination;
 
 typedef struct {

src/include/pygame.h

@@ -58,22 +58,8 @@ typedef struct {
 #define pgSurface_Type (*(PyTypeObject *)PYGAMEAPI_GET_SLOT(surface, 0))
 
 #define pgSurface_Check(x) (PyObject_IsInstance((x), (PyObject *)&pgSurface_Type))
-#define pgSurface_New2 \
-    (*(pgSurfaceObject * (*)(SDL_Surface *, int)) PYGAMEAPI_GET_SLOT(surface, 1))
-
-#define pgSurface_SetSurface \
-    (*(int (*)(pgSurfaceObject *, SDL_Surface *, int))PYGAMEAPI_GET_SLOT(surface, 3))
-
-#define pgSurface_Blit                                                       \
-    (*(int (*)(pgSurfaceObject *, pgSurfaceObject *, SDL_Rect *, SDL_Rect *, \
-               int))PYGAMEAPI_GET_SLOT(surface, 2))
-
 #define import_pygame_surface() _LOAD_SLOTS_FROM_PYGAME(surface)
 
-#define pgSurface_New(surface) pgSurface_New2((surface), 1)
-#define pgSurface_NewNoOwn(surface) pgSurface_New2((surface), 0)
-#define pgSurface_AsSurface(x) (((pgSurfaceObject *)(x))->surf)
-
 #define SURF_INIT_CHECK(surf)                                              \
     if (!surf) {                                                           \
         PyErr_SetString(PyExc_RuntimeError, "Surface is not initialized"); \

src/updaters_simd_avx2.c

@@ -547,14 +547,14 @@ blit_fragments_add_avx2(FragmentationMap *frag_map, PyObject **animation,
         Fragment *fragment = &fragments[i];
         SDL_Surface *src_surf =
             ((pgSurfaceObject *)animation[fragment->animation_index])->surf;
-        const int src_skip = src_surf->pitch / 4 - src_surf->w;
-        const int actual_dst_skip = dst_skip - src_surf->w;
         uint32_t *const src_start = (uint32_t *)src_surf->pixels;
 
         for (int j = 0; j < fragment->length; j++) {
             BlitDestination *item = &destinations[j];
-            uint32_t *srcp32 = src_start;
+            uint32_t *srcp32 = src_start + item->src_offset;
             uint32_t *dstp32 = item->pixels;
+            const int src_skip = src_surf->pitch / 4 - item->width;
+            const int actual_dst_skip = dst_skip - item->width;
 
             if (item->width == 1 && item->rows == 1) {
                 blit_add_avx2_1x1(srcp32, dstp32);

src/updaters_simd_sse2.c

@@ -460,15 +460,15 @@ blit_fragments_add_sse2(FragmentationMap *frag_map, PyObject **animation,
         Fragment *fragment = &fragments[i];
         SDL_Surface *src_surf =
             ((pgSurfaceObject *)animation[fragment->animation_index])->surf;
-        const int src_skip = src_surf->pitch / 4 - src_surf->w;
-        const int actual_dst_skip = dst_skip - src_surf->w;
         uint32_t *const src_start = (uint32_t *)src_surf->pixels;
 
         for (int j = 0; j < fragment->length; j++) {
             BlitDestination *item = &destinations[j];
 
-            uint32_t *srcp32 = src_start;
+            uint32_t *srcp32 = src_start + item->src_offset;
             uint32_t *dstp32 = item->pixels;
+            const int src_skip = src_surf->pitch / 4 - item->width;
+            const int actual_dst_skip = dst_skip - item->width;
 
             if (item->width == 1 && item->rows == 1) {
                 blit_add_sse2_1x1(srcp32, dstp32);
@@ -534,6 +534,6 @@ void
 blit_fragments_add_sse2(FragmentationMap *frag_map, PyObject **animation,
                         int dst_skip)
 {
-    BAD_sse2_FUNCTION_CALL
+    BAD_SSE2_FUNCTION_CALL
 }
 #endif /* __SSE2__ || ENABLE_ARM_NEON */