ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-24 04:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only set colorkey, if converted surface has no alpha channel (2979)

Browse source
This commit is contained in:
Sylvain Becker 2020-05-17 21:23:17 +02:00
parent f6197aec85
commit db4246f695
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video/SDL_surface.c
View file

@ -1116,9 +1116,13 @@ SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
/* The palette is identical, just set the same colorkey */ /* The palette is identical, just set the same colorkey */
SDL_SetColorKey(convert, 1, surface->map->info.colorkey); SDL_SetColorKey(convert, 1, surface->map->info.colorkey);
} else if (!format->palette) { } else if (!format->palette) {
set_colorkey_by_color = SDL_TRUE; if (format->Amask) {
/* Was done by 'palette_ck_transform' */ /* No need to add the colorkey, transparency is in the alpha channel*/
convert_colorkey = SDL_FALSE; } else {
/* Only set the colorkey information */
set_colorkey_by_color = SDL_TRUE;
convert_colorkey = SDL_FALSE;
}
} else { } else {
set_colorkey_by_color = SDL_TRUE; set_colorkey_by_color = SDL_TRUE;
} }