mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-07 20:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix blit with blending (Blit_A) to RGB332 which has no palette

Browse Source
This commit is contained in:
Sylvain Becker
2019-01-30 17:16:08 +01:00
parent 5b07148f73
commit cd25c83aad
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/video/SDL_blit_A.c
View File

@@ -1276,7 +1276,12 @@ SDL_CalculateBlitA(SDL_Surface * surface)
/* Per-pixel alpha blits */ /* Per-pixel alpha blits */
switch (df->BytesPerPixel) { switch (df->BytesPerPixel) {
case 1: case 1:
return BlitNto1PixelAlpha; if (df->palette != NULL) {
return BlitNto1PixelAlpha;
} else {
/* RGB332 has no palette ! */
return BlitNtoNPixelAlpha;
}
case 2: case 2:
if (sf->BytesPerPixel == 4 && sf->Amask == 0xff000000 if (sf->BytesPerPixel == 4 && sf->Amask == 0xff000000
@@ -1326,7 +1331,12 @@ SDL_CalculateBlitA(SDL_Surface * surface)
/* Per-surface alpha blits */ /* Per-surface alpha blits */
switch (df->BytesPerPixel) { switch (df->BytesPerPixel) {
case 1: case 1:
return BlitNto1SurfaceAlpha; if (df->palette != NULL) {
return BlitNto1SurfaceAlpha;
} else {
/* RGB332 has no palette ! */
return BlitNtoNSurfaceAlpha;
}
case 2: case 2:
if (surface->map->identity) { if (surface->map->identity) {
@@ -1374,7 +1384,13 @@ SDL_CalculateBlitA(SDL_Surface * surface)
case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND: case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
if (sf->Amask == 0) { if (sf->Amask == 0) {
if (df->BytesPerPixel == 1) { if (df->BytesPerPixel == 1) {
return BlitNto1SurfaceAlphaKey;
if (df->palette != NULL) {
return BlitNto1SurfaceAlphaKey;
} else {
/* RGB332 has no palette ! */
return BlitNtoNSurfaceAlphaKey;
}
} else { } else {
return BlitNtoNSurfaceAlphaKey; return BlitNtoNSurfaceAlphaKey;
} }