From 2246f270ffd3875cad8c334fdf4878be48620514 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 10 May 2020 22:26:43 +0200 Subject: [PATCH] ARM neon draw helper only available for little endian Fixes: qimage_conversions.cpp:(.text+0x2598): undefined reference to `storeRGB32FromARGB32PM_neon(unsigned char*, unsigned int const*, int, int, QVector const*, QDitherInfo*)' Task-number: QTBUG-84110 Change-Id: I61ac697dd1d0b2c793fd5751209cd041ee30ad38 Pick-to: 5.15 Reviewed-by: Allan Sandfeld Jensen --- src/gui/image/qimage_conversions.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp index ea9a95a6c3..357b936db9 100644 --- a/src/gui/image/qimage_conversions.cpp +++ b/src/gui/image/qimage_conversions.cpp @@ -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 -#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, const QVector *, QDitherInfo *) { @@ -160,7 +160,7 @@ static const uint *QT_FASTCALL fetchRGB32ToARGB32PM(uint *buffer, const uchar *s #ifdef QT_COMPILER_SUPPORTS_SSE4_1 extern void QT_FASTCALL storeRGB32FromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, const QVector *, 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, const QVector *, QDitherInfo *); #endif @@ -188,7 +188,7 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio store = storeRGB32FromARGB32PM_sse4; else store = storeRGB32FromARGB32PM; -#elif defined(__ARM_NEON__) +#elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN) store = storeRGB32FromARGB32PM_neon; #else store = storeRGB32FromARGB32PM; @@ -350,7 +350,7 @@ bool convert_generic_inplace(QImageData *data, QImage::Format dst_format, Qt::Im store = storeRGB32FromARGB32PM_sse4; else store = storeRGB32FromARGB32PM; -#elif defined(__ARM_NEON__) +#elif defined(__ARM_NEON__) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN) store = storeRGB32FromARGB32PM_neon; #else store = storeRGB32FromARGB32PM;