libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Enable blitting 24bpp sources in managed_surface.cpp

Browse Source 
Function `blitFromInner()` excludes source formats with 3 bytes per pixel.  These are commonly returned from opaque full-color image decoders, like JPEG.  This change enables blitting with these source images.

- Add `== 3` to the list of acceptable source formats
- Add READ_UINT24 handling for 3-byte source formats
- Add READ_UINT24 and RGBA conversion for 3-byte destination when blending (copying non-opaque source to 24bpp surface)
This commit is contained in:
Greg Kennedy 2022-11-03 01:43:12 -05:00 committed by Filippos Karapetis
parent aaebd2aa85
commit 253a0519a7
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
graphics/managed_surface.cpp
View File

@ -291,9 +291,8 @@ void ManagedSurface::blitFromInner(const Surface &src, const Common::Rect &srcRe
bool isSameFormat = (destFormat == srcFormat);
if (!isSameFormat) {
// When the pixel format differs, the destination must be non-paletted
assert(destFormat.bytesPerPixel == 2 || destFormat.bytesPerPixel == 3
|| destFormat.bytesPerPixel == 4);
assert(srcFormat.bytesPerPixel == 2 || srcFormat.bytesPerPixel == 4
assert(destFormat.bytesPerPixel == 2 || destFormat.bytesPerPixel == 3 || destFormat.bytesPerPixel == 4);
assert(srcFormat.bytesPerPixel == 2 || srcFormat.bytesPerPixel == 3 || srcFormat.bytesPerPixel == 4
|| (srcFormat.bytesPerPixel == 1 && srcPalette));
}
@ -350,8 +349,10 @@ void ManagedSurface::blitFromInner(const Surface &src, const Common::Rect &srcRe
// Use the src's pixel format to split up the source pixel
if (srcFormat.bytesPerPixel == 2)
col = *reinterpret_cast<const uint16 *>(srcVal);
else
else if (srcFormat.bytesPerPixel == 4)
col = *reinterpret_cast<const uint32 *>(srcVal);
else
col = READ_UINT24(srcVal);
}
const bool isOpaque = ((col & alphaMask) == alphaMask);
@ -386,18 +387,15 @@ void ManagedSurface::blitFromInner(const Surface &src, const Common::Rect &srcRe
bDest = bSrc;
} else {
// Partially transparent, so calculate new pixel colors
if (destFormat.bytesPerPixel == 2) {
uint32 destColor = *reinterpret_cast<uint16 *>(destVal);
destFormat.colorToARGB(destColor, aDest, rDest, gDest, bDest);
} else if (format.bytesPerPixel == 4) {
uint32 destColor = *reinterpret_cast<uint32 *>(destVal);
destFormat.colorToARGB(destColor, aDest, rDest, gDest, bDest);
} else {
aDest = 0xFF;
rDest = destVal[0];
gDest = destVal[1];
bDest = destVal[2];
}
uint32 destColor;
if (destFormat.bytesPerPixel == 2)
destColor = *reinterpret_cast<uint16 *>(destVal);
else if (destFormat.bytesPerPixel == 4)
destColor = *reinterpret_cast<uint32 *>(destVal);
else
destColor = READ_UINT24(destVal);
destFormat.colorToARGB(destColor, aDest, rDest, gDest, bDest);
if (aDest == 0xff) {
// Opaque target