eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Converted surfaces with alpha format default to SDL_BLENDMODE_BLEND

Browse source 
Fixes https://github.com/libsdl-org/SDL/pull/4690
This commit is contained in:
Sam Lantinga 2024-07-16 18:20:10 -07:00
parent 7c0307060d
commit 98bea25363
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/video/SDL_surface.c
View file

@ -1354,7 +1354,6 @@ SDL_Surface *SDL_ConvertSurfaceAndColorspace(SDL_Surface *surface, SDL_PixelForm
int ret; int ret;
SDL_bool palette_ck_transform = SDL_FALSE; SDL_bool palette_ck_transform = SDL_FALSE;
Uint8 palette_ck_value = 0; Uint8 palette_ck_value = 0;
SDL_bool palette_has_alpha = SDL_FALSE;
Uint8 *palette_saved_alpha = NULL; Uint8 *palette_saved_alpha = NULL;
int palette_saved_alpha_ncolors = 0; int palette_saved_alpha_ncolors = 0;
@ -1449,8 +1448,6 @@ SDL_Surface *SDL_ConvertSurfaceAndColorspace(SDL_Surface *surface, SDL_PixelForm
if (!has_alpha_channel) { if (!has_alpha_channel) {
set_opaque = SDL_TRUE; set_opaque = SDL_TRUE;
} }
} else {
palette_has_alpha = SDL_TRUE;
} }
/* Set opaque and backup palette alpha values */ /* Set opaque and backup palette alpha values */
@ -1471,7 +1468,6 @@ SDL_Surface *SDL_ConvertSurfaceAndColorspace(SDL_Surface *surface, SDL_PixelForm
if (copy_flags & SDL_COPY_COLORKEY) { if (copy_flags & SDL_COPY_COLORKEY) {
if (surface->internal->palette && !palette) { if (surface->internal->palette && !palette) {
palette_ck_transform = SDL_TRUE; palette_ck_transform = SDL_TRUE;
palette_has_alpha = SDL_TRUE;
palette_ck_value = surface->internal->palette->colors[surface->internal->map.info.colorkey].a; palette_ck_value = surface->internal->palette->colors[surface->internal->map.info.colorkey].a;
surface->internal->palette->colors[surface->internal->map.info.colorkey].a = SDL_ALPHA_TRANSPARENT; surface->internal->palette->colors[surface->internal->map.info.colorkey].a = SDL_ALPHA_TRANSPARENT;
} }
@ -1592,8 +1588,7 @@ end:
/* Enable alpha blending by default if the new surface has an /* Enable alpha blending by default if the new surface has an
* alpha channel or alpha modulation */ * alpha channel or alpha modulation */
if ((SDL_ISPIXELFORMAT_ALPHA(surface->format) && SDL_ISPIXELFORMAT_ALPHA(format)) || if (SDL_ISPIXELFORMAT_ALPHA(format) ||
(palette_has_alpha && SDL_ISPIXELFORMAT_ALPHA(format)) ||
(copy_flags & SDL_COPY_MODULATE_ALPHA)) { (copy_flags & SDL_COPY_MODULATE_ALPHA)) {
SDL_SetSurfaceBlendMode(convert, SDL_BLENDMODE_BLEND); SDL_SetSurfaceBlendMode(convert, SDL_BLENDMODE_BLEND);
} }