Skip to content

L
libSDL
Commit 04b633b9 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Optimized the copy blitters a little bit 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402036
parent d11e6208
Hide whitespace changes
Inline Side-by-side
Showing with 760 additions and 250 deletions
src/video/SDL_rendercopy.c
View file @ 04b633b9
...@@ -215,11 +215,20 @@ int SDL_RenderCopy_RGB888_RGB888_Blend(SDL_RenderCopyData *data) ...@@ -215,11 +215,20 @@ int SDL_RenderCopy_RGB888_RGB888_Blend(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -287,11 +296,20 @@ int SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -287,11 +296,20 @@ int SDL_RenderCopy_RGB888_RGB888_Blend_Scale(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -341,6 +359,9 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate(SDL_RenderCopyData *data) ...@@ -341,6 +359,9 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -395,6 +416,9 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -395,6 +416,9 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -437,11 +461,20 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -437,11 +461,20 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -521,11 +554,20 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ...@@ -521,11 +554,20 @@ int SDL_RenderCopy_RGB888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -641,11 +683,20 @@ int SDL_RenderCopy_RGB888_BGR888_Blend(SDL_RenderCopyData *data) ...@@ -641,11 +683,20 @@ int SDL_RenderCopy_RGB888_BGR888_Blend(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -713,11 +764,20 @@ int SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -713,11 +764,20 @@ int SDL_RenderCopy_RGB888_BGR888_Blend_Scale(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -767,6 +827,9 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate(SDL_RenderCopyData *data) ...@@ -767,6 +827,9 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -821,6 +884,9 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -821,6 +884,9 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -863,11 +929,20 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -863,11 +929,20 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -947,11 +1022,20 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ...@@ -947,11 +1022,20 @@ int SDL_RenderCopy_RGB888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1067,11 +1151,20 @@ int SDL_RenderCopy_BGR888_RGB888_Blend(SDL_RenderCopyData *data) ...@@ -1067,11 +1151,20 @@ int SDL_RenderCopy_BGR888_RGB888_Blend(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1139,11 +1232,20 @@ int SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -1139,11 +1232,20 @@ int SDL_RenderCopy_BGR888_RGB888_Blend_Scale(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1193,6 +1295,9 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate(SDL_RenderCopyData *data) ...@@ -1193,6 +1295,9 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -1247,6 +1352,9 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -1247,6 +1352,9 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -1289,11 +1397,20 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -1289,11 +1397,20 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1373,11 +1490,20 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ...@@ -1373,11 +1490,20 @@ int SDL_RenderCopy_BGR888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1464,11 +1590,20 @@ int SDL_RenderCopy_BGR888_BGR888_Blend(SDL_RenderCopyData *data) ...@@ -1464,11 +1590,20 @@ int SDL_RenderCopy_BGR888_BGR888_Blend(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1536,11 +1671,20 @@ int SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -1536,11 +1671,20 @@ int SDL_RenderCopy_BGR888_BGR888_Blend_Scale(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1590,6 +1734,9 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate(SDL_RenderCopyData *data) ...@@ -1590,6 +1734,9 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -1644,6 +1791,9 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -1644,6 +1791,9 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -1686,11 +1836,20 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -1686,11 +1836,20 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1770,11 +1929,20 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data) ...@@ -1770,11 +1929,20 @@ int SDL_RenderCopy_BGR888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1890,11 +2058,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend(SDL_RenderCopyData *data) ...@@ -1890,11 +2058,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -1962,11 +2139,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -1962,11 +2139,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Blend_Scale(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2016,6 +2202,9 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate(SDL_RenderCopyData *data) ...@@ -2016,6 +2202,9 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -2070,6 +2259,9 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -2070,6 +2259,9 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -2112,11 +2304,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -2112,11 +2304,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2196,11 +2397,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -2196,11 +2397,20 @@ int SDL_RenderCopy_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2316,11 +2526,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend(SDL_RenderCopyData *data) ...@@ -2316,11 +2526,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2388,11 +2607,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -2388,11 +2607,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Blend_Scale(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2442,6 +2670,9 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate(SDL_RenderCopyData *data) ...@@ -2442,6 +2670,9 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -2496,6 +2727,9 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -2496,6 +2727,9 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -2538,11 +2772,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -2538,11 +2772,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2622,11 +2865,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -2622,11 +2865,20 @@ int SDL_RenderCopy_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2742,11 +2994,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend(SDL_RenderCopyData *data) ...@@ -2742,11 +2994,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2814,11 +3075,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -2814,11 +3075,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -2868,6 +3138,9 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate(SDL_RenderCopyData *data) ...@@ -2868,6 +3138,9 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -2922,6 +3195,9 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -2922,6 +3195,9 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -2964,11 +3240,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -2964,11 +3240,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3048,11 +3333,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -3048,11 +3333,20 @@ int SDL_RenderCopy_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3168,11 +3462,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend(SDL_RenderCopyData *data) ...@@ -3168,11 +3462,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3240,11 +3543,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -3240,11 +3543,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3294,6 +3606,9 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate(SDL_RenderCopyData *data) ...@@ -3294,6 +3606,9 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -3348,6 +3663,9 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -3348,6 +3663,9 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -3390,11 +3708,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -3390,11 +3708,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3474,11 +3801,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -3474,11 +3801,20 @@ int SDL_RenderCopy_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3594,11 +3930,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend(SDL_RenderCopyData *data) ...@@ -3594,11 +3930,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3666,11 +4011,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -3666,11 +4011,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Blend_Scale(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3720,6 +4074,9 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate(SDL_RenderCopyData *data) ...@@ -3720,6 +4074,9 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -3774,6 +4131,9 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -3774,6 +4131,9 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -3816,11 +4176,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -3816,11 +4176,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -3900,11 +4269,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -3900,11 +4269,20 @@ int SDL_RenderCopy_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4020,11 +4398,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend(SDL_RenderCopyData *data) ...@@ -4020,11 +4398,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4092,11 +4479,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -4092,11 +4479,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Blend_Scale(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4146,6 +4542,9 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate(SDL_RenderCopyData *data) ...@@ -4146,6 +4542,9 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -4200,6 +4599,9 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -4200,6 +4599,9 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -4242,11 +4644,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -4242,11 +4644,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4326,11 +4737,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -4326,11 +4737,20 @@ int SDL_RenderCopy_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4446,11 +4866,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend(SDL_RenderCopyData *data) ...@@ -4446,11 +4866,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4518,11 +4947,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -4518,11 +4947,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Blend_Scale(SDL_RenderCopyData *data)
dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF; dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4572,6 +5010,9 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate(SDL_RenderCopyData *data) ...@@ -4572,6 +5010,9 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -4626,6 +5067,9 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -4626,6 +5067,9 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B; pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -4668,11 +5112,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -4668,11 +5112,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4752,11 +5205,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -4752,11 +5205,20 @@ int SDL_RenderCopy_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4872,11 +5334,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend(SDL_RenderCopyData *data) ...@@ -4872,11 +5334,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4944,11 +5415,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data) ...@@ -4944,11 +5415,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Blend_Scale(SDL_RenderCopyData *data)
dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF; dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -4998,6 +5478,9 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate(SDL_RenderCopyData *data) ...@@ -4998,6 +5478,9 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
++src; ++src;
...@@ -5052,6 +5535,9 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data) ...@@ -5052,6 +5535,9 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Scale(SDL_RenderCopyData *data)
G = (G * modulateG) / 255; G = (G * modulateG) / 255;
B = (B * modulateB) / 255; B = (B * modulateB) / 255;
} }
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
A = (A * modulateA) / 255;
}
pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R; pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
*dst = pixel; *dst = pixel;
posx += incx; posx += incx;
...@@ -5094,11 +5580,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data) ...@@ -5094,11 +5580,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend(SDL_RenderCopyData *data)
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
...@@ -5178,11 +5673,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data ...@@ -5178,11 +5673,20 @@ int SDL_RenderCopy_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_RenderCopyData *data
} }
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
srcR = (srcR * srcA) / 255; if (srcA < 255) {
srcG = (srcG * srcA) / 255; srcR = (srcR * srcA) / 255;
srcB = (srcB * srcA) / 255; srcG = (srcG * srcA) / 255;
srcB = (srcB * srcA) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (srcA) {
dstR = srcR;
dstG = srcG;
dstB = srcB;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
dstR = srcR + ((255 - srcA) * dstR) / 255; dstR = srcR + ((255 - srcA) * dstR) / 255;
dstG = srcG + ((255 - srcA) * dstG) / 255; dstG = srcG + ((255 - srcA) * dstG) / 255;
......
src/video/SDL_rendercopy.h
View file @ 04b633b9
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
#define SDL_RENDERCOPY_MODULATE_COLOR 0x0001 #define SDL_RENDERCOPY_MODULATE_COLOR 0x0001
#define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002 #define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002
#define SDL_RENDERCOPY_BLEND 0x0010 #define SDL_RENDERCOPY_MASK 0x0010
#define SDL_RENDERCOPY_ADD 0x0020 #define SDL_RENDERCOPY_BLEND 0x0020
#define SDL_RENDERCOPY_MOD 0x0040 #define SDL_RENDERCOPY_ADD 0x0040
#define SDL_RENDERCOPY_MOD 0x0080
#define SDL_RENDERCOPY_NEAREST 0x0100 #define SDL_RENDERCOPY_NEAREST 0x0100
typedef struct { typedef struct {
......
src/video/SDL_renderer_sw.c
View file @ 04b633b9
...@@ -628,9 +628,9 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -628,9 +628,9 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
copydata.flags |= SDL_RENDERCOPY_MODULATE_ALPHA; copydata.flags |= SDL_RENDERCOPY_MODULATE_ALPHA;
copydata.a = texture->a; copydata.a = texture->a;
} }
if (texture-> if (texture->blendMode & SDL_TEXTUREBLENDMODE_MASK) {
blendMode & (SDL_TEXTUREBLENDMODE_MASK | copydata.flags |= SDL_RENDERCOPY_MASK;
SDL_TEXTUREBLENDMODE_BLEND)) { } else if (texture->blendMode & SDL_TEXTUREBLENDMODE_BLEND) {
copydata.flags |= SDL_RENDERCOPY_BLEND; copydata.flags |= SDL_RENDERCOPY_BLEND;
} else if (texture->blendMode & SDL_TEXTUREBLENDMODE_ADD) { } else if (texture->blendMode & SDL_TEXTUREBLENDMODE_ADD) {
copydata.flags |= SDL_RENDERCOPY_ADD; copydata.flags |= SDL_RENDERCOPY_ADD;
......
src/video/sdlgenblit.pl
View file @ 04b633b9
...@@ -125,9 +125,10 @@ sub output_copydefs ...@@ -125,9 +125,10 @@ sub output_copydefs
print FILE <<__EOF__; print FILE <<__EOF__;
#define SDL_RENDERCOPY_MODULATE_COLOR 0x0001 #define SDL_RENDERCOPY_MODULATE_COLOR 0x0001
#define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002 #define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002
#define SDL_RENDERCOPY_BLEND 0x0010 #define SDL_RENDERCOPY_MASK 0x0010
#define SDL_RENDERCOPY_ADD 0x0020 #define SDL_RENDERCOPY_BLEND 0x0020
#define SDL_RENDERCOPY_MOD 0x0040 #define SDL_RENDERCOPY_ADD 0x0040
#define SDL_RENDERCOPY_MOD 0x0080
#define SDL_RENDERCOPY_NEAREST 0x0100 #define SDL_RENDERCOPY_NEAREST 0x0100
typedef struct { typedef struct {
...@@ -214,19 +215,35 @@ sub output_copycore ...@@ -214,19 +215,35 @@ sub output_copycore
my $dst = shift; my $dst = shift;
my $modulate = shift; my $modulate = shift;
my $blend = shift; my $blend = shift;
if ( $modulate ) { my $s = "";
my $d = "";
# Nice and easy...
if ( $src eq $dst && !$modulate && !$blend ) {
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { *dst = *src;
${src}R = (${src}R * modulateR) / 255;
${src}G = (${src}G * modulateG) / 255;
${src}B = (${src}B * modulateB) / 255;
}
__EOF__ __EOF__
return;
}
if ( $blend ) {
get_rgba("src", $src);
get_rgba("dst", $dst);
$s = "src";
$d = "dst";
} else {
get_rgba("", $src);
} }
if ( $modulate && $blend ) {
if ( $modulate ) {
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & SDL_RENDERCOPY_MODULATE_COLOR) {
${s}R = (${s}R * modulateR) / 255;
${s}G = (${s}G * modulateG) / 255;
${s}B = (${s}B * modulateB) / 255;
}
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
${src}A = (${src}A * modulateA) / 255; ${s}A = (${s}A * modulateA) / 255;
} }
__EOF__ __EOF__
} }
...@@ -234,29 +251,43 @@ __EOF__ ...@@ -234,29 +251,43 @@ __EOF__
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
${src}R = (${src}R * ${src}A) / 255; if (${s}A < 255) {
${src}G = (${src}G * ${src}A) / 255; ${s}R = (${s}R * ${s}A) / 255;
${src}B = (${src}B * ${src}A) / 255; ${s}G = (${s}G * ${s}A) / 255;
${s}B = (${s}B * ${s}A) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (${s}A) {
${d}R = ${s}R;
${d}G = ${s}G;
${d}B = ${s}B;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
${dst}R = ${src}R + ((255 - ${src}A) * ${dst}R) / 255; ${d}R = ${s}R + ((255 - ${s}A) * ${d}R) / 255;
${dst}G = ${src}G + ((255 - ${src}A) * ${dst}G) / 255; ${d}G = ${s}G + ((255 - ${s}A) * ${d}G) / 255;
${dst}B = ${src}B + ((255 - ${src}A) * ${dst}B) / 255; ${d}B = ${s}B + ((255 - ${s}A) * ${d}B) / 255;
break; break;
case SDL_RENDERCOPY_ADD: case SDL_RENDERCOPY_ADD:
${dst}R = ${src}R + ${dst}R; if (${dst}R > 255) ${dst}R = 255; ${d}R = ${s}R + ${d}R; if (${d}R > 255) ${d}R = 255;
${dst}G = ${src}G + ${dst}G; if (${dst}G > 255) ${dst}G = 255; ${d}G = ${s}G + ${d}G; if (${d}G > 255) ${d}G = 255;
${dst}B = ${src}B + ${dst}B; if (${dst}B > 255) ${dst}B = 255; ${d}B = ${s}B + ${d}B; if (${d}B > 255) ${d}B = 255;
break; break;
case SDL_RENDERCOPY_MOD: case SDL_RENDERCOPY_MOD:
${dst}R = (${src}R * ${dst}R) / 255; ${d}R = (${s}R * ${d}R) / 255;
${dst}G = (${src}G * ${dst}G) / 255; ${d}G = (${s}G * ${d}G) / 255;
${dst}B = (${src}B * ${dst}B) / 255; ${d}B = (${s}B * ${d}B) / 255;
break; break;
} }
__EOF__ __EOF__
} }
if ( $blend ) {
set_rgba("dst", $dst);
} else {
set_rgba("", $dst);
}
} }
sub output_copyfunc sub output_copyfunc
...@@ -325,20 +356,7 @@ __EOF__ ...@@ -325,20 +356,7 @@ __EOF__
print FILE <<__EOF__; print FILE <<__EOF__;
} }
__EOF__ __EOF__
if ( $blend ) { output_copycore($src, $dst, $modulate, $blend);
get_rgba("src", $src);
get_rgba("dst", $dst);
output_copycore("src", "dst", $modulate, $blend);
set_rgba("dst", $dst);
} elsif ( $modulate || $src ne $dst ) {
get_rgba("", $src);
output_copycore("", "", $modulate, $blend);
set_rgba("", $dst);
} else {
print FILE <<__EOF__;
*dst = *src;
__EOF__
}
print FILE <<__EOF__; print FILE <<__EOF__;
posx += incx; posx += incx;
++dst; ++dst;
...@@ -356,20 +374,7 @@ __EOF__ ...@@ -356,20 +374,7 @@ __EOF__
int n = data->dst_w; int n = data->dst_w;
while (n--) { while (n--) {
__EOF__ __EOF__
if ( $blend ) { output_copycore($src, $dst, $modulate, $blend);
get_rgba("src", $src);
get_rgba("dst", $dst);
output_copycore("src", "dst", $modulate, $blend);
set_rgba("dst", $dst);
} elsif ( $modulate || $src ne $dst ) {
get_rgba("", $src);
output_copycore("", "", $modulate, $blend);
set_rgba("", $dst);
} else {
print FILE <<__EOF__;
*dst = *src;
__EOF__
}
print FILE <<__EOF__; print FILE <<__EOF__;
++src; ++src;
++dst; ++dst;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment