libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SURFACESDL: Don't pass private flags to SDL_CreateRGBSurface

Browse Source 
sdl_video.h names all of SDL_RLEACCEL, SDL_SRCCOLORKEY and SDL_SRCALPHA
as private and read-only. Documentation mentions them in
SDL_CreateRGBSurface but also says they are automatically set on
either SDL_SetColorKey or on non-zero Amask.

Previously passing them created no problem but miyoo mini SDL gets confused,
so let's never pass the private flags.
This commit is contained in:
Vladimir Serbinenko 2023-01-16 09:35:34 +01:00
parent abcb191fce
commit a0cb2fb05e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -1980,7 +1980,7 @@ void SurfaceSdlGraphicsManager::setMouseCursor(const void *buf, uint w, uint h,
assert(!_mouseOrigSurface);
// Allocate bigger surface because scalers will read past the boudaries.
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
_mouseOrigSurface = SDL_CreateRGBSurface(SDL_SWSURFACE,
_mouseCurState.w + _maxExtraPixels * 2,
_mouseCurState.h + _maxExtraPixels * 2,
_cursorFormat.bytesPerPixel * 8,
@ -2074,7 +2074,7 @@ void SurfaceSdlGraphicsManager::blitCursor() {
if (_mouseSurface)
SDL_FreeSurface(_mouseSurface);
_mouseSurface = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA,
_mouseSurface = SDL_CreateRGBSurface(SDL_SWSURFACE,
_mouseCurState.rW,
_mouseCurState.rH,
_mouseOrigSurface->format->BitsPerPixel,
@ -2260,7 +2260,7 @@ void SurfaceSdlGraphicsManager::displayMessageOnOSD(const Common::U32String &msg
height = _hwScreen->h;
_osdMessageSurface = SDL_CreateRGBSurface(
SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCALPHA,
SDL_SWSURFACE,
width, height, _hwScreen->format->BitsPerPixel, _hwScreen->format->Rmask, _hwScreen->format->Gmask, _hwScreen->format->Bmask, _hwScreen->format->Amask
);
@ -2334,7 +2334,7 @@ void SurfaceSdlGraphicsManager::displayActivityIconOnOSD(const Graphics::Surface
const Graphics::PixelFormat &iconFormat = icon->format;
_osdIconSurface = SDL_CreateRGBSurface(
SDL_SWSURFACE | SDL_RLEACCEL | SDL_SRCALPHA,
SDL_SWSURFACE,
icon->w, icon->h, iconFormat.bytesPerPixel * 8,
((0xFF >> iconFormat.rLoss) << iconFormat.rShift),
((0xFF >> iconFormat.gLoss) << iconFormat.gShift),