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

Fixed bug 3657 - Color-key doesn't work when an alpha channel is present

Browse Source 
When surface format is the same as renderer format, it still needs an
intermediate conversion to transform colorkey to alpha.
This commit is contained in:
Sylvain Becker 2019-01-19 16:47:43 +01:00
parent 9d10c73853
commit 07548602d6
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/render/SDL_render.c
View File

@ -1187,6 +1187,7 @@ SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface)
{ {
const SDL_PixelFormat *fmt; const SDL_PixelFormat *fmt;
SDL_bool needAlpha; SDL_bool needAlpha;
SDL_bool direct_update;
Uint32 i; Uint32 i;
Uint32 format; Uint32 format;
SDL_Texture *texture; SDL_Texture *texture;
@ -1233,6 +1234,20 @@ SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface)
} }
if (format == surface->format->format) { if (format == surface->format->format) {
if (surface->format->Amask && SDL_HasColorKey(surface)) {
/* Surface and Renderer formats are identicals.
* Intermediate conversion is needed to convert color key to alpha (SDL_ConvertColorkeyToAlpha()). */
direct_update = SDL_FALSE;
} else {
/* Update Texture directly */
direct_update = SDL_TRUE;
}
} else {
/* Surface and Renderer formats are differents, it needs an intermediate conversion. */
direct_update = SDL_FALSE;
}
if (direct_update) {
if (SDL_MUSTLOCK(surface)) { if (SDL_MUSTLOCK(surface)) {
SDL_LockSurface(surface); SDL_LockSurface(surface);
SDL_UpdateTexture(texture, NULL, surface->pixels, surface->pitch); SDL_UpdateTexture(texture, NULL, surface->pixels, surface->pitch);