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

GRAPHICS: Fix Normal and AdvMame scalers not applying cursor mask to additive texture

Browse source
This commit is contained in:
elasota 2023-03-03 23:18:43 -05:00 • committed by Eugene Sandulenko
parent 18f947272a
commit 2841b9931d
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
backends/graphics/opengl/texture.cpp
View file

@ -458,16 +458,23 @@ void FakeTexture::updateGLTexture() {
byte *dst = (byte *)outSurf->getBasePtr(dirtyArea.left, dirtyArea.top);
const byte *src = (const byte *)_rgbData.getBasePtr(dirtyArea.left, dirtyArea.top);
applyPaletteAndMask(dst, src, outSurf->pitch, _rgbData.pitch, _rgbData.w, dirtyArea, outSurf->format, _rgbData.format);
// Do generic handling of updating the texture.
Texture::updateGLTexture();
}
void FakeTexture::applyPaletteAndMask(byte *dst, const byte *src, uint dstPitch, uint srcPitch, uint srcWidth, const Common::Rect &dirtyArea, const Graphics::PixelFormat &dstFormat, const Graphics::PixelFormat &srcFormat) const {
if (_palette) {
Graphics::crossBlitMap(dst, src, outSurf->pitch, _rgbData.pitch, dirtyArea.width(), dirtyArea.height(), outSurf->format.bytesPerPixel, _palette);
Graphics::crossBlitMap(dst, src, dstPitch, srcPitch, dirtyArea.width(), dirtyArea.height(), dstFormat.bytesPerPixel, _palette);
} else {
Graphics::crossBlit(dst, src, outSurf->pitch, _rgbData.pitch, dirtyArea.width(), dirtyArea.height(), outSurf->format, _rgbData.format);
Graphics::crossBlit(dst, src, dstPitch, srcPitch, dirtyArea.width(), dirtyArea.height(), dstFormat, srcFormat);
}
if (_mask) {
uint maskPitch = _rgbData.w;
uint maskPitch = srcWidth;
uint dirtyWidth = dirtyArea.width();
byte destBPP = outSurf->format.bytesPerPixel;
byte destBPP = dstFormat.bytesPerPixel;
const byte *maskRowStart = (_mask + dirtyArea.top * maskPitch + dirtyArea.left);
byte *dstRowStart = dst;
@ -485,13 +492,10 @@ void FakeTexture::updateGLTexture() {
}
}
dstRowStart += outSurf->pitch;
dstRowStart += dstPitch;
maskRowStart += maskPitch;
}
}
// Do generic handling of updating the texture.
Texture::updateGLTexture();
}
TextureRGB555::TextureRGB555()
@ -631,11 +635,7 @@ void ScaledTexture::updateGLTexture() {
dst = (byte *)_convData->getBasePtr(dirtyArea.left + _extraPixels, dirtyArea.top + _extraPixels);
dstPitch = _convData->pitch;
if (_palette) {
Graphics::crossBlitMap(dst, src, dstPitch, srcPitch, dirtyArea.width(), dirtyArea.height(), _convData->format.bytesPerPixel, _palette);
} else {
Graphics::crossBlit(dst, src, dstPitch, srcPitch, dirtyArea.width(), dirtyArea.height(), _convData->format, _rgbData.format);
}
applyPaletteAndMask(dst, src, dstPitch, srcPitch, _rgbData.w, dirtyArea, _convData->format, _rgbData.format);
src = dst;
srcPitch = dstPitch;