summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qdrawhelper_avx2.cpp
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2018-02-10 20:39:02 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-02-10 20:39:02 +0000
commit095dbc494c6cb9815b0d9b521a3105b06f4bef33 (patch)
treeec5b2ac5777406a533e820f21b5705b209855a0d /src/gui/painting/qdrawhelper_avx2.cpp
parent0b48fcee709ac0070d7b9213632edeafeeddc9e1 (diff)
parent32b506d1db1f8cee748a27b548ba8208f2928058 (diff)
Merge "Merge remote-tracking branch 'origin/dev' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/gui/painting/qdrawhelper_avx2.cpp')
-rw-r--r--src/gui/painting/qdrawhelper_avx2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper_avx2.cpp b/src/gui/painting/qdrawhelper_avx2.cpp
index cf89f408b5..3a70524a9d 100644
--- a/src/gui/painting/qdrawhelper_avx2.cpp
+++ b/src/gui/painting/qdrawhelper_avx2.cpp
@@ -427,7 +427,7 @@ void QT_FASTCALL comp_func_Source_rgb64_avx2(QRgba64 *dst, const QRgba64 *src, i
::memcpy(dst, src, length * sizeof(QRgba64));
} else {
const uint ca = const_alpha | (const_alpha << 8); // adjust to [0-65535]
- const uint cia = 65535 - const_alpha;
+ const uint cia = 65535 - ca;
int x = 0;
@@ -493,7 +493,7 @@ void QT_FASTCALL comp_func_solid_SourceOver_rgb64_avx2(QRgba64 *destPixels, int
if (const_alpha != 255)
color = multiplyAlpha255(color, const_alpha);
- const uint minusAlphaOfColor = ~ushort(color.alpha());
+ const uint minusAlphaOfColor = 65535 - color.alpha();
int x = 0;
quint64 *dst = (quint64 *) destPixels;
const __m256i colorVector = _mm256_set1_epi64x(color);