Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-22 08:45:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

It turns out both the software and the OpenGL renderer had the same problem.

Browse Source 
According to the spec, when SDL_SRCALPHA is set, the colorkey is ignored, so
we just need to convert the colorkey into the alpha channel.
This commit is contained in:
Sam Lantinga
2008-11-25 05:29:14 +00:00
parent 8f182d2156
commit 868d2ced9e
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/SDL_surface.c
View File

@@ -270,7 +270,7 @@ SDL_SetColorKey(SDL_Surface * surface, Uint32 flag, Uint32 key)
}
/* This is a fairly slow function to switch from colorkey to alpha */
void
static void
SDL_ConvertColorkeyToAlpha(SDL_Surface * surface)
{
int x, y;
@@ -813,6 +813,7 @@ SDL_ConvertSurface(SDL_Surface * surface,
&keyG, &keyB, &keyA);
SDL_SetColorKey(convert, 1,
SDL_MapRGBA(convert->format, keyR, keyG, keyB, keyA));
SDL_ConvertColorkeyToAlpha(convert);
}
convert->map->info.r = surface->map->info.r;
convert->map->info.g = surface->map->info.g;

4
src/video/SDL_video.c
View File

@@ -46,9 +46,6 @@
#endif
#endif /* SDL_VIDEO_OPENGL */
/* From SDL_surface.c */
extern void SDL_ConvertColorkeyToAlpha(SDL_Surface * surface);
/* Available video drivers */
static VideoBootStrap *bootstrap[] = {
#if SDL_VIDEO_DRIVER_COCOA
@@ -1588,7 +1585,6 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
}
dst = SDL_ConvertSurface(surface, dst_fmt, 0);
if (dst) {
SDL_ConvertColorkeyToAlpha(dst);
SDL_UpdateTexture(textureID, NULL, dst->pixels, dst->pitch);
SDL_FreeSurface(dst);
}