1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM neon draw helper only available for little endian

Browse Source 
Fixes:

  qimage_conversions.cpp:(.text+0x2598): undefined reference to `storeRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector<unsigned int> const*, QDitherInfo*)'

Task-number: QTBUG-84110
Change-Id: I61ac697dd1d0b2c793fd5751209cd041ee30ad38
Pick-to: 5.15
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Peter Seiderer 2020-05-10 22:26:43 +02:00
parent b49314af1d
commit 2246f270ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ void qGamma_correct_back_to_linear_cs(QImage *image)
*****************************************************************************/ *****************************************************************************/
// The drawhelper conversions from/to RGB32 are passthroughs which is not always correct for general image conversion // The drawhelper conversions from/to RGB32 are passthroughs which is not always correct for general image conversion
#if !defined(__ARM_NEON__) #if !defined(__ARM_NEON__) || !(Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
static void QT_FASTCALL storeRGB32FromARGB32PM(uchar *dest, const uint *src, int index, int count, static void QT_FASTCALL storeRGB32FromARGB32PM(uchar *dest, const uint *src, int index, int count,
const QVector<QRgb> *, QDitherInfo *) const QVector<QRgb> *, QDitherInfo *)
{ {
@ -160,7 +160,7 @@ static const uint *QT_FASTCALL fetchRGB32ToARGB32PM(uint *buffer, const uchar *s
#ifdef QT_COMPILER_SUPPORTS_SSE4_1 #ifdef QT_COMPILER_SUPPORTS_SSE4_1
extern void QT_FASTCALL storeRGB32FromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, extern void QT_FASTCALL storeRGB32FromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count,
const QVector<QRgb> *, QDitherInfo *); const QVector<QRgb> *, QDitherInfo *);
#elif defined(__ARM_NEON__) #elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
extern void QT_FASTCALL storeRGB32FromARGB32PM_neon(uchar *dest, const uint *src, int index, int count, extern void QT_FASTCALL storeRGB32FromARGB32PM_neon(uchar *dest, const uint *src, int index, int count,
const QVector<QRgb> *, QDitherInfo *); const QVector<QRgb> *, QDitherInfo *);
#endif #endif
@ -188,7 +188,7 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio
store = storeRGB32FromARGB32PM_sse4; store = storeRGB32FromARGB32PM_sse4;
else else
store = storeRGB32FromARGB32PM; store = storeRGB32FromARGB32PM;
#elif defined(__ARM_NEON__) #elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
store = storeRGB32FromARGB32PM_neon; store = storeRGB32FromARGB32PM_neon;
#else #else
store = storeRGB32FromARGB32PM; store = storeRGB32FromARGB32PM;
@ -350,7 +350,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im
store = storeRGB32FromARGB32PM_sse4; store = storeRGB32FromARGB32PM_sse4;
else else
store = storeRGB32FromARGB32PM; store = storeRGB32FromARGB32PM;
#elif defined(__ARM_NEON__) #elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
store = storeRGB32FromARGB32PM_neon; store = storeRGB32FromARGB32PM_neon;
#else #else
store = storeRGB32FromARGB32PM; store = storeRGB32FromARGB32PM;