thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "SDL: Use RLE acceleration for SDL2 transparent surfaces"

Browse source 
This reverts commit 6b4195a542.
There seemed to be no clear benefit in using RLE for transparent
surfaces, and there were a few reports that it might cause crashes
on Windows. So to be on the safe side I prefer to revert this
commit.
This commit is contained in:
Thierry Crozat 2017-11-26 01:36:21 +00:00
parent 9d61d70c0d
commit 2d88a30803
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backends/platform/sdl/sdl.cpp
View file

@ -765,13 +765,10 @@ int SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha) {
if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE)) { if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE)) {
return -1; return -1;
} }
SDL_SetSurfaceRLE(surface, 0);
} else { } else {
if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND)) { if (SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND)) {
return -1; return -1;
} }
if (flag & SDL_RLEACCEL)
SDL_SetSurfaceRLE(surface, 1);
} }
return 0; return 0;
@ -779,13 +776,7 @@ int SDL_SetAlpha(SDL_Surface *surface, Uint32 flag, Uint8 alpha) {
#undef SDL_SetColorKey #undef SDL_SetColorKey
int SDL_SetColorKey_replacement(SDL_Surface *surface, Uint32 flag, Uint32 key) { int SDL_SetColorKey_replacement(SDL_Surface *surface, Uint32 flag, Uint32 key) {
if (SDL_SetColorKey(surface, SDL_TRUE, key)) { return SDL_SetColorKey(surface, SDL_TRUE, key) ? -1 : 0;
return -1;
}
if (flag & SDL_RLEACCEL)
SDL_SetSurfaceRLE(surface, 1);
return 0;
} }
#endif #endif