encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure/cmake: Disable ARM SIMD and NEON by default. 

It's buggy at the moment.
This commit is contained in:
Ryan C. Gordon 2020-06-26 23:30:59 -04:00
parent 694fea8ad8
commit 363fd52b41
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -328,8 +328,8 @@ set_option(SSE "Use SSE assembly routines" ${OPT_DEF_ASM})
set_option(SSE2 "Use SSE2 assembly routines" ${OPT_DEF_SSEMATH}) set_option(SSE2 "Use SSE2 assembly routines" ${OPT_DEF_SSEMATH})
set_option(SSE3 "Use SSE3 assembly routines" ${OPT_DEF_SSEMATH}) set_option(SSE3 "Use SSE3 assembly routines" ${OPT_DEF_SSEMATH})
set_option(ALTIVEC "Use Altivec assembly routines" ${OPT_DEF_ASM}) set_option(ALTIVEC "Use Altivec assembly routines" ${OPT_DEF_ASM})
set_option(ARMSIMD "use SIMD assembly blitters on ARM" ON) set_option(ARMSIMD "use SIMD assembly blitters on ARM" OFF)
set_option(ARMNEON "use NEON assembly blitters on ARM" ON) set_option(ARMNEON "use NEON assembly blitters on ARM" OFF)
set_option(DISKAUDIO "Support the disk writer audio driver" ON) set_option(DISKAUDIO "Support the disk writer audio driver" ON)
set_option(DUMMYAUDIO "Support the dummy audio driver" ON) set_option(DUMMYAUDIO "Support the dummy audio driver" ON)
set_option(VIDEO_DIRECTFB "Use DirectFB video driver" OFF) set_option(VIDEO_DIRECTFB "Use DirectFB video driver" OFF)

16
configure vendored
View File

@ -852,8 +852,8 @@ enable_diskaudio
enable_dummyaudio enable_dummyaudio
enable_libsamplerate enable_libsamplerate
enable_libsamplerate_shared enable_libsamplerate_shared
enable_arm_simd
enable_arm_neon enable_arm_neon
enable_arm_simd
enable_video_wayland enable_video_wayland
enable_video_wayland_qt_touch enable_video_wayland_qt_touch
enable_wayland_shared enable_wayland_shared
@ -1635,7 +1635,6 @@ Optional Features:
--enable-libsamplerate-shared --enable-libsamplerate-shared
dynamically load libsamplerate [[default=yes]] dynamically load libsamplerate [[default=yes]]
--enable-arm-simd use SIMD assembly blitters on ARM [[default=yes]] --enable-arm-simd use SIMD assembly blitters on ARM [[default=yes]]
--enable-arm-neon use NEON assembly blitters on ARM [[default=no]]
--enable-video-wayland use Wayland video driver [[default=yes]] --enable-video-wayland use Wayland video driver [[default=yes]]
--enable-video-wayland-qt-touch --enable-video-wayland-qt-touch
QtWayland server support for Wayland video driver QtWayland server support for Wayland video driver
@ -19473,9 +19472,7 @@ CheckARM()
if test "${enable_arm_simd+set}" = set; then : if test "${enable_arm_simd+set}" = set; then :
enableval=$enable_arm_simd; enable_arm_simd=$enableval enableval=$enable_arm_simd; enable_arm_simd=$enableval
else else
enable_arm_simd=yes enable_arm_simd=no
fi
if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_simd = xyes; then if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_simd = xyes; then
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
have_arm_simd=no have_arm_simd=no
@ -19494,7 +19491,7 @@ $as_echo_n "checking for ARM SIMD... " >&6; }
#ifndef __ARM_EABI__ #ifndef __ARM_EABI__
#error EABI is required (to be sure that calling conventions are compatible) #error EABI is required (to be sure that calling conventions are compatible)
#endif #endif
pld [r0] pld r0
uqadd8 r0, r0, r0 uqadd8 r0, r0, r0
_ACEOF _ACEOF
@ -19519,6 +19516,7 @@ $as_echo "#define SDL_ARM_SIMD_BLITTERS 1" >>confdefs.h
CheckNEON() CheckNEON()
{ {
--enable-arm-neon use NEON assembly blitters on ARM [[default=no]]
# Check whether --enable-arm-neon was given. # Check whether --enable-arm-neon was given.
if test "${enable_arm_neon+set}" = set; then : if test "${enable_arm_neon+set}" = set; then :
enableval=$enable_arm_neon; enable_arm_neon=$enableval enableval=$enable_arm_neon; enable_arm_neon=$enableval
@ -19546,7 +19544,7 @@ $as_echo_n "checking for ARM NEON... " >&6; }
#ifndef __ARM_EABI__ #ifndef __ARM_EABI__
#error EABI is required (to be sure that calling conventions are compatible) #error EABI is required (to be sure that calling conventions are compatible)
#endif #endif
pld [r0] pld r0
vmovn.u16 d0, q0 vmovn.u16 d0, q0
_ACEOF _ACEOF
@ -19759,7 +19757,9 @@ $as_echo "$have_gcc_Wall" >&6; }
$as_echo_n "checking for necessary GCC -Wno-multichar option... " >&6; } $as_echo_n "checking for necessary GCC -Wno-multichar option... " >&6; }
need_gcc_Wno_multichar=no need_gcc_Wno_multichar=no
case "$host" in case "$host" in
*-*-haiku*) *-*-haiku*
fi
need_gcc_Wno_multichar=yes need_gcc_Wno_multichar=yes
;; ;;
esac esac

2
configure.ac
View File

@ -1320,7 +1320,7 @@ CheckARM()
{ {
AC_ARG_ENABLE(arm-simd, AC_ARG_ENABLE(arm-simd,
AC_HELP_STRING([--enable-arm-simd], [use SIMD assembly blitters on ARM [[default=yes]]]), AC_HELP_STRING([--enable-arm-simd], [use SIMD assembly blitters on ARM [[default=yes]]]),
enable_arm_simd=$enableval, enable_arm_simd=yes) enable_arm_simd=$enableval, enable_arm_simd=no
if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_simd = xyes; then if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_arm_simd = xyes; then
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
have_arm_simd=no have_arm_simd=no