diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-30 14:38:16 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 17:55:37 +0200 |
commit | 398c8513b172d4605a27dfa6125045b55e7cb29e (patch) | |
tree | b5997e08351873452745f8b20f22558d66710e40 /src/gui/image/qjpeghandler.cpp | |
parent | 5cbdba588a14e05fd282b5850a3e7b66fd9b2b65 (diff) |
Overhaul the qsimd_p.h: rename macros and update conditionals
The QT_HAVE_xxx macros are replaced with QT_COMPILER_SUPPORTS_xxx.
They indicate that the compiler supports those intrinsics, but not
necessarily that they can be used right now.
ICC and MSVC allow one to use the intrinsics anywhere, but for Qt all
uses of the intrinsics are either in specially-built files, protected
by runtime checks, or they are unconditional (qstring.cpp). So we only
use the intrinsics when the compiler was instructed to generate code
for that instruction set anyway.
Change-Id: Ie58eebbc0518ad1d5420a85174fd84153bb9abaa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui/image/qjpeghandler.cpp')
-rw-r--r-- | src/gui/image/qjpeghandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index c42977ef10..eff106a486 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -875,20 +875,20 @@ QJpegHandler::QJpegHandler() { const uint features = qDetectCPUFeatures(); Q_UNUSED(features); -#if defined(QT_HAVE_NEON) +#if defined(QT_COMPILER_SUPPORTS_NEON) // from qimage_neon.cpp Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len); if (features & NEON) rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_neon; -#endif // QT_HAVE_NEON -#if defined(QT_HAVE_SSSE3) +#endif // QT_COMPILER_SUPPORTS_NEON +#if defined(QT_COMPILER_SUPPORTS_SSSE3) // from qimage_ssse3.cpp Q_GUI_EXPORT void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len); if (features & SSSE3) rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_ssse3; -#endif // QT_HAVE_SSSE3 +#endif // QT_COMPILER_SUPPORTS_SSSE3 } QJpegHandler::~QJpegHandler() |