Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-29 20:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with colorkey, palette and format conversion

Browse Source 
Set the colorkey information on the converted surface.
Test-case in bug 3826/2979, conflicting with bug 4798
This commit is contained in:
Sylvain Becker 2020-05-17 20:45:55 +02:00
parent 39690a0478
commit f6197aec85
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/SDL_surface.c
View File

@ -1106,6 +1106,7 @@ SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
if (copy_flags & SDL_COPY_COLORKEY) { if (copy_flags & SDL_COPY_COLORKEY) {
SDL_bool set_colorkey_by_color = SDL_FALSE; SDL_bool set_colorkey_by_color = SDL_FALSE;
SDL_bool convert_colorkey = SDL_TRUE;
if (surface->format->palette) { if (surface->format->palette) {
if (format->palette && if (format->palette &&
@ -1115,7 +1116,9 @@ 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;
/* Was done by 'palette_ck_transform' */ /* Was done by 'palette_ck_transform' */
convert_colorkey = SDL_FALSE;
} else { } else {
set_colorkey_by_color = SDL_TRUE; set_colorkey_by_color = SDL_TRUE;
} }
@ -1156,9 +1159,11 @@ SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
SDL_SetColorKey(convert, 1, converted_colorkey); SDL_SetColorKey(convert, 1, converted_colorkey);
/* This is needed when converting for 3D texture upload */ /* This is needed when converting for 3D texture upload */
if (convert_colorkey) {
SDL_ConvertColorkeyToAlpha(convert, SDL_TRUE); SDL_ConvertColorkeyToAlpha(convert, SDL_TRUE);
} }
} }
}
SDL_SetClipRect(convert, &surface->clip_rect); SDL_SetClipRect(convert, &surface->clip_rect);
/* Enable alpha blending by default if the new surface has an /* Enable alpha blending by default if the new surface has an