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

SDL: Fix scaled 32bpp cursor rendering

Browse source
This commit is contained in:
Colin Snover 2017-10-15 21:34:25 -05:00
parent 1947d310df
commit 4466738885
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View file

@ -1181,8 +1181,10 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
} }
// Add the area covered by the mouse cursor to the list of dirty rects if // Add the area covered by the mouse cursor to the list of dirty rects if
// we have to redraw the mouse. // we have to redraw the mouse, or if the cursor is alpha-blended since
if (_cursorNeedsRedraw) // alpha-blended cursors will happily blend into themselves if the surface
// under the cursor is not reset first
if (_cursorNeedsRedraw || _cursorFormat.bytesPerPixel == 4)
undrawMouse(); undrawMouse();
#ifdef USE_OSD #ifdef USE_OSD
@ -1843,7 +1845,6 @@ void SurfaceSdlGraphicsManager::setMouseCursor(const void *buf, uint w, uint h,
if (_cursorFormat.bytesPerPixel == 4) { if (_cursorFormat.bytesPerPixel == 4) {
assert(keyColor == 0); assert(keyColor == 0);
dontScale = true;
} else { } else {
assert(keyColor < 1U << (_cursorFormat.bytesPerPixel * 8)); assert(keyColor < 1U << (_cursorFormat.bytesPerPixel * 8));
} }
@ -1937,8 +1938,6 @@ void SurfaceSdlGraphicsManager::blitCursor() {
cursorScale = _videoMode.scaleFactor; cursorScale = _videoMode.scaleFactor;
} }
assert(_cursorFormat.bytesPerPixel != 4 || cursorScale == 1);
// Adapt the real hotspot according to the scale factor. // Adapt the real hotspot according to the scale factor.
int rW = w * cursorScale; int rW = w * cursorScale;
int rH = h * cursorScale; int rH = h * cursorScale;
@ -2157,18 +2156,16 @@ void SurfaceSdlGraphicsManager::drawMouse() {
dst.w = _mouseCurState.rW; dst.w = _mouseCurState.rW;
dst.h = _mouseCurState.rH; dst.h = _mouseCurState.rH;
// Alpha-blended cursors will happily blend into themselves if the hardware
// surface under the cursor is not reset first
if (!_forceRedraw && _cursorFormat.bytesPerPixel == 4) {
if (SDL_BlitSurface(_screen, &dst, _hwScreen, &dst) != 0)
error("SD_BlitSurface failed: %s", SDL_GetError());
}
// Note that SDL_BlitSurface() and addDirtyRect() will both perform any // Note that SDL_BlitSurface() and addDirtyRect() will both perform any
// clipping necessary // clipping necessary
if (_cursorFormat.bytesPerPixel == 4 && scale != 1) {
if (SDL_BlitScaled(_mouseSurface, nullptr, _hwScreen, &dst) != 0)
error("SDL_BlitScaled failed: %s", SDL_GetError());
} else {
if (SDL_BlitSurface(_mouseSurface, nullptr, _hwScreen, &dst) != 0) if (SDL_BlitSurface(_mouseSurface, nullptr, _hwScreen, &dst) != 0)
error("SDL_BlitSurface failed: %s", SDL_GetError()); error("SDL_BlitSurface failed: %s", SDL_GetError());
}
// The screen will be updated using real surface coordinates, i.e. // The screen will be updated using real surface coordinates, i.e.
// they will not be scaled or aspect-ratio corrected. // they will not be scaled or aspect-ratio corrected.