Commit afd1b3dae479db3428476b23c2e901b91121c999
2019-02-17T16:20:23
Fix invalid memory access and optimise Blit_3or4_to_3or4__* Fix invalid write at last pixel of the surface: when surface has no padding (pitch == w * bpp) and bpp is 3 with Blit, no colorkey, and NO_ALPHA same or inverse rgb triplet Optimise by using int32 access: BGR24 -> ARGB8888 : faster x1.897875 (362405 -> 190953) RGB24 -> ABGR8888 : faster x1.660416 (363304 -> 218803) ABGR8888 -> RGB24 : faster x1.686319 (334962 -> 198635) ARGB8888 -> BGR24 : faster x1.691868 (324524 -> 191814) BGR24 -> RGB888 : faster x1.678459 (326811 -> 194709) BGR888 -> RGB24 : faster x1.731772 (327724 -> 189242) RGB24 -> BGR888 : faster x1.690989 (328916 -> 194511) RGB888 -> BGR24 : faster x1.698333 (326175 -> 192056)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
index c31cd9a..9a2f241 100644
--- a/src/video/SDL_blit_N.c
+++ b/src/video/SDL_blit_N.c
@@ -2938,33 +2938,54 @@ Blit_3or4_to_3or4__same_rgb(SDL_BlitInfo * info)
if (dstfmt->Amask) {
/* SET_ALPHA */
Uint32 mask = info->a << dstfmt->Ashift;
+ int last_line = 0;
+ if (srcbpp == 3 && height) {
+ height -= 1;
+ last_line = 1;
+ }
+
while (height--) {
/* *INDENT-OFF* */
DUFFS_LOOP(
{
Uint32 *dst32 = (Uint32*)dst;
- Uint8 s0 = src[0];
- Uint8 s1 = src[1];
- Uint8 s2 = src[2];
- *dst32 = (s0) | (s1 << 8) | (s2 << 16) | mask;
- dst += dstbpp;
+ Uint32 *src32 = (Uint32*)src;
+ *dst32 = *src32 | mask;
+ dst += 4;
src += srcbpp;
}, width);
/* *INDENT-ON* */
src += srcskip;
dst += dstskip;
}
+
+ if (last_line) {
+ while (width--) {
+ Uint32 *dst32 = (Uint32*)dst;
+ Uint8 s0 = src[0];
+ Uint8 s1 = src[1];
+ Uint8 s2 = src[2];
+ *dst32 = (s0) | (s1 << 8) | (s2 << 16) | mask;
+ dst += 4;
+ src += srcbpp;
+ }
+ }
} else {
/* NO_ALPHA */
+ int mask = srcfmt->Rmask | srcfmt->Gmask | srcfmt->Bmask;
+ int last_line = 0;
+ if ((dstbpp == 3 || srcbpp == 3) && height) {
+ height -= 1;
+ last_line = 1;
+ }
+
while (height--) {
/* *INDENT-OFF* */
DUFFS_LOOP(
{
Uint32 *dst32 = (Uint32*)dst;
- Uint8 s0 = src[0];
- Uint8 s1 = src[1];
- Uint8 s2 = src[2];
- *dst32 = (s0) | (s1 << 8) | (s2 << 16);
+ Uint32 *src32 = (Uint32*)src;
+ *dst32 = *src32 & mask;
dst += dstbpp;
src += srcbpp;
}, width);
@@ -2972,6 +2993,19 @@ Blit_3or4_to_3or4__same_rgb(SDL_BlitInfo * info)
src += srcskip;
dst += dstskip;
}
+
+ if (last_line) {
+ while (width--) {
+ Uint8 s0 = src[0];
+ Uint8 s1 = src[1];
+ Uint8 s2 = src[2];
+ dst[0] = s0;
+ dst[1] = s1;
+ dst[2] = s2;
+ dst += dstbpp;
+ src += srcbpp;
+ }
+ }
}
return;
}
@@ -3036,6 +3070,12 @@ Blit_3or4_to_3or4__inversed_rgb(SDL_BlitInfo * info)
}
} else {
/* NO_ALPHA */
+ int last_line = 0;
+ if (dstbpp == 3 && height) {
+ height -= 1;
+ last_line = 1;
+ }
+
while (height--) {
/* *INDENT-OFF* */
DUFFS_LOOP(
@@ -3053,6 +3093,20 @@ Blit_3or4_to_3or4__inversed_rgb(SDL_BlitInfo * info)
src += srcskip;
dst += dstskip;
}
+
+ if (last_line) {
+ while (width--) {
+ Uint8 s0 = src[0];
+ Uint8 s1 = src[1];
+ Uint8 s2 = src[2];
+ /* inversed, compared to Blit_3or4_to_3or4__same_rgb */
+ dst[0] = s2;
+ dst[1] = s1;
+ dst[2] = s0;
+ dst += dstbpp;
+ src += srcbpp;
+ }
+ }
}
return;
}