]>
Commit | Line | Data |
---|---|---|
b90768b3 JB |
1 | --- openal-soft-1.20.0/common/alnumeric.h.orig 2019-11-28 09:45:08.000000000 +0100 |
2 | +++ openal-soft-1.20.0/common/alnumeric.h 2019-12-04 05:28:38.843039338 +0100 | |
3 | @@ -191,7 +191,7 @@ | |
4 | */ | |
5 | inline int fastf2i(float f) noexcept | |
6 | { | |
7 | -#if defined(HAVE_SSE_INTRINSICS) | |
8 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE_MATH__) | |
9 | return _mm_cvt_ss2si(_mm_set_ss(f)); | |
10 | ||
11 | #elif defined(_MSC_VER) && defined(_M_IX86_FP) | |
12 | @@ -222,7 +222,7 @@ | |
13 | /** Converts float-to-int using standard behavior (truncation). */ | |
14 | inline int float2int(float f) noexcept | |
15 | { | |
16 | -#if defined(HAVE_SSE_INTRINSICS) | |
17 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE_MATH__) | |
18 | return _mm_cvtt_ss2si(_mm_set_ss(f)); | |
19 | ||
4899bbd7 | 20 | #elif (defined(_MSC_VER) && defined(_M_IX86_FP) && _M_IX86_FP == 0) \ |
b90768b3 JB |
21 | @@ -257,7 +257,7 @@ |
22 | /** Converts double-to-int using standard behavior (truncation). */ | |
23 | inline int double2int(double d) noexcept | |
24 | { | |
25 | -#if defined(HAVE_SSE_INTRINSICS) | |
26 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE_MATH__) | |
27 | return _mm_cvttsd_si32(_mm_set_sd(d)); | |
28 | ||
4899bbd7 | 29 | #elif (defined(_MSC_VER) && defined(_M_IX86_FP) && _M_IX86_FP < 2) \ |
fa0d858c JP |
30 | --- openal-soft-1.20.0/core/fpu_ctrl.cpp.orig 2019-11-28 09:45:08.000000000 +0100 |
31 | +++ openal-soft-1.20.0/core/fpu_ctrl.cpp 2019-12-04 18:37:09.810067181 +0100 | |
b90768b3 | 32 | @@ -209,7 +209,7 @@ |
b90768b3 | 33 | { |
fa0d858c JP |
34 | if(this->in_mode) return; |
35 | ||
b90768b3 JB |
36 | -#if defined(HAVE_SSE_INTRINSICS) |
37 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE_MATH__) | |
38 | this->sse_state = _mm_getcsr(); | |
4899bbd7 JP |
39 | unsigned int sseState{this->sse_state}; |
40 | sseState &= ~(_MM_FLUSH_ZERO_MASK | _MM_DENORMALS_ZERO_MASK); | |
b90768b3 JB |
41 | @@ -236,7 +236,7 @@ |
42 | { | |
43 | if(!this->in_mode) return; | |
44 | ||
45 | -#if defined(HAVE_SSE_INTRINSICS) | |
46 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE_MATH__) | |
47 | _mm_setcsr(this->sse_state); | |
48 | ||
49 | #elif defined(__GNUC__) && defined(HAVE_SSE) | |
27bdd119 JB |
50 | --- openal-soft-1.21.0/alc/effects/convolution.cpp.orig 2020-11-04 11:00:35.000000000 +0100 |
51 | +++ openal-soft-1.21.0/alc/effects/convolution.cpp 2020-11-05 06:23:28.093700396 +0100 | |
52 | @@ -1,7 +1,7 @@ | |
4899bbd7 JP |
53 | #include <stdint.h> |
54 | #include <utility> | |
27bdd119 JB |
55 | |
56 | -#ifdef HAVE_SSE_INTRINSICS | |
57 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) | |
58 | #include <xmmintrin.h> | |
4899bbd7 JP |
59 | #elif defined(HAVE_NEON) |
60 | #include <arm_neon.h> | |
27bdd119 JB |
61 | @@ -108,7 +108,7 @@ |
62 | ||
63 | void apply_fir(al::span<float> dst, const float *RESTRICT src, const float *RESTRICT filter) | |
64 | { | |
65 | -#ifdef HAVE_SSE_INTRINSICS | |
66 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) | |
67 | for(float &output : dst) | |
68 | { | |
69 | __m128 r4{_mm_setzero_ps()}; | |
4899bbd7 JP |
70 | --- openal-soft-1.22.0/common/phase_shifter.h.orig 2022-04-23 03:46:14.000000000 +0200 |
71 | +++ openal-soft-1.22.0/common/phase_shifter.h 2022-04-23 12:16:39.561832386 +0200 | |
72 | @@ -1,7 +1,7 @@ | |
73 | #ifndef PHASE_SHIFTER_H | |
74 | #define PHASE_SHIFTER_H | |
27bdd119 JB |
75 | |
76 | -#ifdef HAVE_SSE_INTRINSICS | |
769e4bfc | 77 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) |
27bdd119 | 78 | #include <xmmintrin.h> |
4899bbd7 JP |
79 | #elif defined(HAVE_NEON) |
80 | #include <arm_neon.h> | |
81 | @@ -116,7 +116,7 @@ | |
82 | template<size_t S> | |
83 | inline void PhaseShifterT<S>::process(al::span<float> dst, const float *RESTRICT src) const | |
27bdd119 JB |
84 | { |
85 | -#ifdef HAVE_SSE_INTRINSICS | |
769e4bfc | 86 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) |
4899bbd7 JP |
87 | if(size_t todo{dst.size()>>1}) |
88 | { | |
89 | auto *out = reinterpret_cast<__m64*>(dst.data()); | |
90 | @@ -215,7 +215,7 @@ | |
91 | template<size_t S> | |
92 | inline void PhaseShifterT<S>::processAccum(al::span<float> dst, const float *RESTRICT src) const | |
93 | { | |
94 | -#ifdef HAVE_SSE_INTRINSICS | |
769e4bfc | 95 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) |
27bdd119 JB |
96 | if(size_t todo{dst.size()>>1}) |
97 | { | |
4899bbd7 | 98 | auto *out = reinterpret_cast<__m64*>(dst.data()); |