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

Implement remaining porter-duff compositions for rgb64

Browse Source 
Gets rid of debug output when they are used, which is more common now
that we use it for unpremultiplied ARGB32.

Task-number: QTBUG-60549
Change-Id: I14b2eb34d1d08612916e2b69b188f33dbe1b525c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2017-05-23 15:46:30 +02:00
parent e400b7e326
commit 0169edf6fd
2 changed files with 784 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

792
src/gui/painting/qcompositionfunctions.cpp
View File

File diff suppressed because it is too large Load Diff

11
src/gui/painting/qdrawhelper.cpp
View File

@ -55,10 +55,13 @@
#endif #endif
#include <private/qguiapplication_p.h> #include <private/qguiapplication_p.h>
#include <private/qrgba64_p.h> #include <private/qrgba64_p.h>
#include <qloggingcategory.h>
#include <qmath.h> #include <qmath.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcQtGuiDrawHelper, "qt.gui.drawhelper")
#define MASK(src, a) src = BYTE_MUL(src, a) #define MASK(src, a) src = BYTE_MUL(src, a)
/* /*
@ -3772,7 +3775,7 @@ void blend_color_generic_rgb64(int count, const QSpan *spans, void *userData)
QSpanData *data = reinterpret_cast<QSpanData *>(userData); QSpanData *data = reinterpret_cast<QSpanData *>(userData);
Operator op = getOperator(data, spans, count); Operator op = getOperator(data, spans, count);
if (!op.funcSolid64) { if (!op.funcSolid64) {
qDebug("unsupported 64bit blend attempted"); qCDebug(lcQtGuiDrawHelper, "blend_color_generic_rgb64: unsupported 64bit blend attempted, falling back to 32-bit");
return blend_color_generic(count, spans, userData); return blend_color_generic(count, spans, userData);
} }
@ -4010,7 +4013,7 @@ static void blend_src_generic_rgb64(int count, const QSpan *spans, void *userDat
if (blend64.isSupported()) if (blend64.isSupported())
handleSpans(count, spans, data, blend64); handleSpans(count, spans, data, blend64);
else { else {
qDebug("blend_src_generic_rgb64: unsupported 64-bit blend attempted"); qCDebug(lcQtGuiDrawHelper, "blend_src_generic_rgb64: unsupported 64-bit blend attempted, falling back to 32-bit");
BlendSrcGeneric blend32(data, op); BlendSrcGeneric blend32(data, op);
handleSpans(count, spans, data, blend32); handleSpans(count, spans, data, blend32);
} }
@ -4067,7 +4070,7 @@ static void blend_untransformed_generic_rgb64(int count, const QSpan *spans, voi
Operator op = getOperator(data, spans, count); Operator op = getOperator(data, spans, count);
if (!op.func64) { if (!op.func64) {
qWarning("Unsupported blend"); qCDebug(lcQtGuiDrawHelper, "blend_untransformed_generic_rgb64: unsupported 64-bit blend attempted, falling back to 32-bit");
return blend_untransformed_generic(count, spans, userData); return blend_untransformed_generic(count, spans, userData);
} }
quint64 buffer[buffer_size]; quint64 buffer[buffer_size];
@ -4308,7 +4311,7 @@ static void blend_tiled_generic_rgb64(int count, const QSpan *spans, void *userD
Operator op = getOperator(data, spans, count); Operator op = getOperator(data, spans, count);
if (!op.func64) { if (!op.func64) {
qDebug("unsupported rgb64 blend"); qCDebug(lcQtGuiDrawHelper, "blend_tiled_generic_rgb64: unsupported 64-bit blend attempted, falling back to 32-bit");
return blend_tiled_generic(count, spans, userData); return blend_tiled_generic(count, spans, userData);
} }
quint64 buffer[buffer_size]; quint64 buffer[buffer_size];