AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize conversion from unpremultiplied to opaque formats

Browse Source 
Save unnecessary premultiply and unpremultiplication when converting
from an unpremultiplied format like ARGB32 to any opaque format like
RGB32 or RGB16.

Change-Id: I73f58200ff5c62fb07910e6f2b1c29b7e254d327
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2017-05-17 12:26:09 +02:00
parent e794c1bb79
commit 7fbc7c9600
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/image/qimage_conversions.cpp
View File

@ -126,8 +126,8 @@ static const uint *QT_FASTCALL convertRGB32FromARGB32PM(uint *buffer, const uint
return buffer; return buffer;
} }
static const uint *QT_FASTCALL convertRGB32ToARGB32PM(uint *buffer, const uint *src, int count, static const uint *QT_FASTCALL maskRGB32(uint *buffer, const uint *src, int count,
const QVector<QRgb> *, QDitherInfo *) const QVector<QRgb> *, QDitherInfo *)
{ {
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
buffer[i] = 0xff000000 |src[i]; buffer[i] = 0xff000000 |src[i];
@ -160,8 +160,9 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
// If the source doesn't have an alpha channel, we can use the faster convertFromRGB32 method. // If the source doesn't have an alpha channel, we can use the faster convertFromRGB32 method.
convertFromARGB32PM = destLayout->convertFromRGB32; convertFromARGB32PM = destLayout->convertFromRGB32;
} else { } else {
// The drawhelpers do not mask the alpha value in RGB32, we want to here.
if (src->format == QImage::Format_RGB32) if (src->format == QImage::Format_RGB32)
convertToARGB32PM = convertRGB32ToARGB32PM; convertToARGB32PM = maskRGB32;
if (dest->format == QImage::Format_RGB32) { if (dest->format == QImage::Format_RGB32) {
#ifdef QT_COMPILER_SUPPORTS_SSE4_1 #ifdef QT_COMPILER_SUPPORTS_SSE4_1
if (qCpuHasFeature(SSE4_1)) if (qCpuHasFeature(SSE4_1))
@ -171,6 +172,15 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
convertFromARGB32PM = convertRGB32FromARGB32PM; convertFromARGB32PM = convertRGB32FromARGB32PM;
} }
} }
if ((src->format == QImage::Format_ARGB32 || src->format == QImage::Format_RGBA8888) &&
destLayout->alphaWidth == 0 && destLayout->convertFromRGB32) {
// Avoid unnecessary premultiply and unpremultiply when converting from unpremultiplied src format.
convertToARGB32PM = qPixelLayouts[src->format + 1].convertToARGB32PM;
if (dest->format == QImage::Format_RGB32)
convertFromARGB32PM = maskRGB32;
else
convertFromARGB32PM = destLayout->convertFromRGB32;
}
QDitherInfo dither; QDitherInfo dither;
QDitherInfo *ditherPtr = 0; QDitherInfo *ditherPtr = 0;
if ((flags & Qt::PreferDither) && (flags & Qt::Dither_Mask) != Qt::ThresholdDither) if ((flags & Qt::PreferDither) && (flags & Qt::Dither_Mask) != Qt::ThresholdDither)
@ -221,7 +231,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
convertFromARGB32PM = destLayout->convertFromRGB32; convertFromARGB32PM = destLayout->convertFromRGB32;
} else { } else {
if (data->format == QImage::Format_RGB32) if (data->format == QImage::Format_RGB32)
convertToARGB32PM = convertRGB32ToARGB32PM; convertToARGB32PM = maskRGB32;
if (dst_format == QImage::Format_RGB32) { if (dst_format == QImage::Format_RGB32) {
#ifdef QT_COMPILER_SUPPORTS_SSE4_1 #ifdef QT_COMPILER_SUPPORTS_SSE4_1
if (qCpuHasFeature(SSE4_1)) if (qCpuHasFeature(SSE4_1))
@ -231,6 +241,15 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
convertFromARGB32PM = convertRGB32FromARGB32PM; convertFromARGB32PM = convertRGB32FromARGB32PM;
} }
} }
if ((data->format == QImage::Format_ARGB32 || data->format == QImage::Format_RGBA8888) &&
destLayout->alphaWidth == 0 && destLayout->convertFromRGB32) {
// Avoid unnecessary premultiply and unpremultiply when converting from unpremultiplied src format.
convertToARGB32PM = qPixelLayouts[data->format + 1].convertToARGB32PM;
if (dst_format == QImage::Format_RGB32)
convertFromARGB32PM = maskRGB32;
else
convertFromARGB32PM = destLayout->convertFromRGB32;
}
QDitherInfo dither; QDitherInfo dither;
QDitherInfo *ditherPtr = 0; QDitherInfo *ditherPtr = 0;
if ((flags & Qt::PreferDither) && (flags & Qt::Dither_Mask) != Qt::ThresholdDither) if ((flags & Qt::PreferDither) && (flags & Qt::Dither_Mask) != Qt::ThresholdDither)