diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-12-09 15:28:05 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-12-09 17:48:55 +0000 |
| commit | 49568df95450733dc4c273945e5ced218132c123 (patch) | |
| tree | a58afe59aac7d9f71bf393677111833edbd5b022 /src/gui/painting/painting.pri | |
| parent | 02a730331e123d2db778c8af62d7c0e3098da813 (diff) | |
iOS: Enable non-pixman NEON drawhelpers for both 32 and 64-bit
The pixman drawhelpers are implemented using GAS syntax, which the
Clang assembler doesn't handle, nor do they work on 64-bit ARM, so
we disable them selectively. They are only used for 16-bit surfaces
anyways, so it not a big deal on iOS.
Change-Id: I78417fabd7f671f9c5d94b6e5fa5ce10d3fc1d27
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/gui/painting/painting.pri')
| -rw-r--r-- | src/gui/painting/painting.pri | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 45eb8ccbab..a75e40e413 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -101,12 +101,10 @@ SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \ painting/qimagescale_sse4.cpp AVX2_SOURCES += painting/qdrawhelper_avx2.cpp -!ios { - CONFIG += no_clang_integrated_as - NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp - NEON_HEADERS += painting/qdrawhelper_neon_p.h - !contains(QT_ARCH, "arm64"): NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S -} +NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp +NEON_HEADERS += painting/qdrawhelper_neon_p.h +NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S +!ios:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp MIPS_DSP_HEADERS += painting/qdrawhelper_mips_dsp_p.h painting/qt_mips_asm_dsp_p.h |