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

Remove last traces of QT_COMPILER_SUPPORTS_NEON

Browse Source 
Fixes ARM build, as the NEON drawhelpers and image conversion functions
were ifdef'ed out.

Follow-up to 1b12c0608be2359baa2f96ae28b135a84abd388c.

Change-Id: I0b5e89c8f445741432db2dfe1f8d971b971c8605
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Tor Arne Vestbø 2014-01-16 18:46:13 +01:00 committed by The Qt Project
parent 0cd776f2cd
commit e5066a3a2e
8 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6213,7 +6213,7 @@ fi
echo "" >>"$outpath/src/corelib/global/qconfig.h.new" echo "" >>"$outpath/src/corelib/global/qconfig.h.new"
echo "// Compiler sub-arch support" >>"$outpath/src/corelib/global/qconfig.h.new" echo "// Compiler sub-arch support" >>"$outpath/src/corelib/global/qconfig.h.new"
for SUBARCH in SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2 \ for SUBARCH in SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2 \
IWMMXT NEON \ IWMMXT \
MIPS_DSP MIPS_DSPR2; do MIPS_DSP MIPS_DSPR2; do
eval "VAL=\$CFG_$SUBARCH" eval "VAL=\$CFG_$SUBARCH"
case "$VAL" in case "$VAL" in

1
src/corelib/global/qcompilerdetection.h
View File

@ -1018,7 +1018,6 @@
#endif #endif
#if !defined(Q_PROCESSOR_ARM) #if !defined(Q_PROCESSOR_ARM)
# undef QT_COMPILER_SUPPORTS_IWMMXT # undef QT_COMPILER_SUPPORTS_IWMMXT
# undef QT_COMPILER_SUPPORTS_NEON
#endif #endif
#if !defined(Q_PROCESSOR_MIPS) #if !defined(Q_PROCESSOR_MIPS)
# undef QT_COMPILER_SUPPORTS_MIPS_DSP # undef QT_COMPILER_SUPPORTS_MIPS_DSP

4
src/corelib/tools/qsimd.cpp
View File

@ -54,7 +54,7 @@
# include <intrin.h> # include <intrin.h>
# endif # endif
# endif # endif
#elif defined(Q_OS_LINUX) && (defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT) || defined(QT_COMPILER_SUPPORTS_NEON)) #elif defined(Q_OS_LINUX) && (defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT))
#include "private/qcore_unix_p.h" #include "private/qcore_unix_p.h"
// the kernel header definitions for HWCAP_* // the kernel header definitions for HWCAP_*
@ -102,7 +102,7 @@ static inline uint detectProcessorFeatures()
return features; return features;
} }
#elif defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT) || defined(QT_COMPILER_SUPPORTS_NEON) #elif defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT)
static inline uint detectProcessorFeatures() static inline uint detectProcessorFeatures()
{ {
uint features = 0; uint features = 0;

4
src/gui/image/qimage_neon.cpp
View File

@ -43,7 +43,7 @@
#include <private/qimage_p.h> #include <private/qimage_p.h>
#include <private/qsimd_p.h> #include <private/qsimd_p.h>
#ifdef QT_COMPILER_SUPPORTS_NEON #ifdef __ARM_NEON__
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -111,4 +111,4 @@ void convert_RGB888_to_RGB32_neon(QImageData *dest, const QImageData *src, Qt::I
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_COMPILER_SUPPORTS_NEON #endif // __ARM_NEON__

2
src/gui/image/qjpeghandler.cpp
View File

@ -866,7 +866,7 @@ QJpegHandler::QJpegHandler()
if (qCpuHasFeature(NEON)) if (qCpuHasFeature(NEON))
rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_neon; rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_neon;
#endif // QT_COMPILER_SUPPORTS_NEON #endif // __ARM_NEON__
#if defined(QT_COMPILER_SUPPORTS_SSSE3) #if defined(QT_COMPILER_SUPPORTS_SSSE3)
// from qimage_ssse3.cpp // from qimage_ssse3.cpp

4
src/gui/painting/qdrawhelper_neon.cpp
View File

@ -43,7 +43,7 @@
#include <private/qblendfunctions_p.h> #include <private/qblendfunctions_p.h>
#include <private/qmath_p.h> #include <private/qmath_p.h>
#ifdef QT_COMPILER_SUPPORTS_NEON #ifdef __ARM_NEON__
#include <private/qdrawhelper_neon_p.h> #include <private/qdrawhelper_neon_p.h>
#include <private/qpaintengine_raster_p.h> #include <private/qpaintengine_raster_p.h>
@ -998,5 +998,5 @@ const uint * QT_FASTCALL qt_fetch_radial_gradient_neon(uint *buffer, const Opera
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_COMPILER_SUPPORTS_NEON #endif // __ARM_NEON__

4
src/gui/painting/qdrawhelper_neon_p.h
View File

@ -57,7 +57,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef QT_COMPILER_SUPPORTS_NEON #ifdef __ARM_NEON__
void qt_blend_argb32_on_argb32_neon(uchar *destPixels, int dbpl, void qt_blend_argb32_on_argb32_neon(uchar *destPixels, int dbpl,
const uchar *srcPixels, int sbpl, const uchar *srcPixels, int sbpl,
@ -139,7 +139,7 @@ void QT_FASTCALL qt_destStoreRGB16_neon(QRasterBuffer *rasterBuffer,
void QT_FASTCALL comp_func_solid_SourceOver_neon(uint *destPixels, int length, uint color, uint const_alpha); void QT_FASTCALL comp_func_solid_SourceOver_neon(uint *destPixels, int length, uint color, uint const_alpha);
void QT_FASTCALL comp_func_Plus_neon(uint *dst, const uint *src, int length, uint const_alpha); void QT_FASTCALL comp_func_Plus_neon(uint *dst, const uint *src, int length, uint const_alpha);
#endif // QT_COMPILER_SUPPORTS_NEON #endif // __ARM_NEON__
QT_END_NAMESPACE QT_END_NAMESPACE

2
tools/configure/configureapp.cpp
View File

@ -3389,8 +3389,6 @@ void Configure::generateConfigfiles()
tmpStream << "#define QT_COMPILER_SUPPORTS_AVX2" << endl; tmpStream << "#define QT_COMPILER_SUPPORTS_AVX2" << endl;
if (dictionary[ "IWMMXT" ] == "yes") if (dictionary[ "IWMMXT" ] == "yes")
tmpStream << "#define QT_COMPILER_SUPPORTS_IWMMXT" << endl; tmpStream << "#define QT_COMPILER_SUPPORTS_IWMMXT" << endl;
if (dictionary[ "NEON" ] == "yes")
tmpStream << "#define QT_COMPILER_SUPPORTS_NEON" << endl;
if (dictionary["QREAL"] != "double") if (dictionary["QREAL"] != "double")
tmpStream << "#define QT_COORD_TYPE " << dictionary["QREAL"] << endl; tmpStream << "#define QT_COORD_TYPE " << dictionary["QREAL"] << endl;