diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-04-13 16:06:57 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-04-16 19:24:06 +0000 |
| commit | 964ccc58534aac436529007000d1c38d76c88834 (patch) | |
| tree | d452d03dabe7c109527987b9f9385de5374c1b12 /tests | |
| parent | 365c63e7b177701c0bf80a7cb138b7559b92f350 (diff) | |
Remove separate SSE4 unpremultiply function
Merges the SSE4 specific unpremultiply with the normal version, and
adds a SSE2 fallback. There was no reason to split the two since
compile time options will ensure the right version is inlined.
Also adds short-cut for 0 and 255 values.
Change-Id: Ie5aa262f6964219fd3062d4a498f697cf79a4595
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/painting/qcolor/tst_qcolor.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp index 4fafbf9827..c34b1639cc 100644 --- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp +++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp @@ -38,7 +38,6 @@ #include <qcolor.h> #include <qdebug.h> -#include <private/qdrawingprimitive_sse2_p.h> class tst_QColor : public QObject { @@ -104,7 +103,6 @@ private slots: void achromaticHslHue(); void premultiply(); - void unpremultiply_sse4(); #ifdef Q_DEAD_CODE_FROM_QT4_X11 void setallowX11ColorNames(); @@ -1447,22 +1445,5 @@ void tst_QColor::premultiply() } } -void tst_QColor::unpremultiply_sse4() -{ - // Tests that qUnpremultiply_sse4 returns the same as qUnpremultiply. -#if QT_COMPILER_SUPPORTS_HERE(SSE4_1) - if (qCpuHasFeature(SSE4_1)) { - for (uint a = 0; a < 256; a++) { - for (uint c = 0; c <= a; c++) { - QRgb p = qRgba(c, a-c, c, a); - QCOMPARE(qUnpremultiply(p), qUnpremultiply_sse4(p)); - } - } - return; - } -#endif - QSKIP("SSE4 not supported on this CPU."); -} - QTEST_MAIN(tst_QColor) #include "tst_qcolor.moc" |