whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QColorTransform on RGBA64_Premultiplied 

The lack of an unsigned pack 32bit->16bit without SSE4, meant
the premultiplied path would saturate color values over 32735.

Pick-to: 6.2
Change-Id: Ia76e0369fd11a6767e8db78bf9a10eea30d91d2c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Allan Sandfeld Jensen 2021-06-09 13:55:30 +02:00
parent 9c32e7dc60
commit 19faa03620
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/painting/qcolortransform.cpp
View File

@ -594,16 +594,27 @@ void loadUnpremultiplied<QRgba64>(QColorVector *buffer, const QRgba64 *src, cons
#if defined(__SSE2__)
template<typename T>
static inline void storeP(T &p, const __m128i &v);
static inline void storeP(T &p, __m128i &v, int a);
template<>
inline void storeP<QRgb>(QRgb &p, const __m128i &v)
inline void storeP<QRgb>(QRgb &p, __m128i &v, int a)
{
v = _mm_packs_epi32(v, v);
v = _mm_insert_epi16(v, a, 3);
p = _mm_cvtsi128_si32(_mm_packus_epi16(v, v));
}
template<>
inline void storeP<QRgba64>(QRgba64 &p, const __m128i &v)
inline void storeP<QRgba64>(QRgba64 &p, __m128i &v, int a)
{
#if defined(__SSE4_1__)
v = _mm_packus_epi32(v, v);
v = _mm_insert_epi16(v, a, 3);
_mm_storel_epi64((__m128i *)&p, v);
#else
const int r = _mm_extract_epi16(v, 0);
const int g = _mm_extract_epi16(v, 2);
const int b = _mm_extract_epi16(v, 4);
p = qRgba64(r, g, b, a);
#endif
}
template<typename T>
@ -627,9 +638,7 @@ static void storePremultiplied(T *dst, const T *src, const QColorVector *buffer,
vf = _mm_cvtepi32_ps(v);
vf = _mm_mul_ps(vf, va);
v = _mm_cvtps_epi32(vf);
v = _mm_packs_epi32(v, v);
v = _mm_insert_epi16(v, a, 3);
storeP<T>(dst[i], v);
storeP<T>(dst[i], v, a);
}
}