geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve portability of SDL_Convert51ToStereo_AVX 

Don't rely on checking __clang_major__ since it is not comparable
between different vendors. Don't use "#pragma clang attribute" since it
is only available in relatively recent versions, there's no obvious way
to check if it's supported, and just using __attribute__ directly (for
gcc as well) results in simpler code anyway.
main
Joshua Root 2021-08-13 07:58:48 +10:00 committed by Sam Lantinga
parent 9bf6557585
commit 1e92135297
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/SDL_audiocvt.c
View File

@ -47,7 +47,7 @@
#define HAVE_AVX_INTRINSICS 1 #define HAVE_AVX_INTRINSICS 1
#endif #endif
#if defined __clang__ #if defined __clang__
# if (__clang_major__ < 5) # if (!__has_attribute(target))
# undef HAVE_AVX_INTRINSICS # undef HAVE_AVX_INTRINSICS
# endif # endif
# if (defined(_MSC_VER) || defined(__SCE__)) && !defined(__AVX__) # if (defined(_MSC_VER) || defined(__SCE__)) && !defined(__AVX__)
@ -116,11 +116,8 @@ SDL_ConvertStereoToMono(SDL_AudioCVT * cvt, SDL_AudioFormat format)
#if HAVE_AVX_INTRINSICS #if HAVE_AVX_INTRINSICS
/* MSVC will always accept AVX intrinsics when compiling for x64 */ /* MSVC will always accept AVX intrinsics when compiling for x64 */
#if defined(__clang__) #if defined(__clang__) || defined(__GNUC__)
#pragma clang attribute push (__attribute__((target("avx"))), apply_to=function) __attribute__((target("avx")))
#elif defined(__GNUC__)
#pragma GCC push_options
#pragma GCC target("avx")
#endif #endif
/* Convert from 5.1 to stereo. Average left and right, distribute center, discard LFE. */ /* Convert from 5.1 to stereo. Average left and right, distribute center, discard LFE. */
static void SDLCALL static void SDLCALL
@ -181,11 +178,6 @@ SDL_Convert51ToStereo_AVX(SDL_AudioCVT * cvt, SDL_AudioFormat format)
cvt->filters[cvt->filter_index] (cvt, format); cvt->filters[cvt->filter_index] (cvt, format);
} }
} }
#if defined(__clang__)
#pragma clang attribute pop
#elif defined(__GNUC__)
#pragma GCC pop_options
#endif
#endif #endif
#if HAVE_SSE_INTRINSICS #if HAVE_SSE_INTRINSICS