diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-24 17:03:53 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-25 17:48:39 +0200 |
| commit | 86ac3a98b50a29882e896a0703ec9201e71fe989 (patch) | |
| tree | 1b3fb36e1b221a1ff415b9a40ae190492b9bc3bf /src | |
| parent | 875ba6e80c9a70dd1fc0f6026f41450cb6fb8adb (diff) | |
Restore Neon "detection" in Qt
We don't actually detect whether the compiler can create Neon code or
provides Neon intrinsics. Most of them do, so that test would be mostly
moot. We removed the detection previously because we couldn't
automatically enable Neon due to leakage of instructions outside the
areas protected at runtime.
Instead, we rely on the mkspec properly passing the necessary flags that
enable Neon support.
This commit does not change that. All it does is verify whether the arch
detection found "neon" as part of the target CPU features. In other
words, it moves the test that was in simd.prf to configure.
It does fix the Neon detection in configure.exe, which was always
failing for trying to run a test that didn't exist
(config.tests/unix/neon).
Change-Id: Id561dfb2db7d3dca7b8c29afef63181693bdc0aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/image.pri | 4 | ||||
| -rw-r--r-- | src/gui/painting/painting.pri | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index bbdd0f3da7..ba4328c16e 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -78,12 +78,10 @@ contains(QT_CONFIG, jpeg):include($$PWD/qjpeghandler.pri) contains(QT_CONFIG, gif):include($$PWD/qgifhandler.pri) # SIMD -contains(QT_CPU_FEATURES.$$QT_ARCH, neon) { - SOURCES += image/qimage_neon.cpp -} contains(QT_CPU_FEATURES.$$QT_ARCH, sse2) { SOURCES += image/qimage_sse2.cpp SSSE3_SOURCES += image/qimage_ssse3.cpp } +NEON_SOURCES += image/qimage_neon.cpp MIPS_DSPR2_SOURCES += image/qimage_mips_dspr2.cpp MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index bc4b2f27d8..8fc0156c02 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -97,10 +97,10 @@ contains(QT_CPU_FEATURES.$$QT_ARCH, sse2) { } IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp -!ios:contains(QT_CPU_FEATURES.$$QT_ARCH, neon) { +!ios:neon { CONFIG += no_clang_integrated_as - SOURCES += painting/qdrawhelper_neon.cpp - HEADERS += painting/qdrawhelper_neon_p.h + NEON_SOURCES += painting/qdrawhelper_neon.cpp + NEON_HEADERS += painting/qdrawhelper_neon_p.h NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S } |