]>
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 | ||
20 | #elif ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) && \ | |
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 | ||
29 | #elif ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) && \ | |
94a1f148 JP |
30 | --- openal-soft-1.20.0/alc/fpu_ctrl.cpp.orig 2019-11-28 09:45:08.000000000 +0100 |
31 | +++ openal-soft-1.20.0/alc/fpu_ctrl.cpp 2019-12-04 18:37:09.810067181 +0100 | |
b90768b3 JB |
32 | @@ -209,7 +209,7 @@ |
33 | ||
34 | FPUCtl::FPUCtl() | |
35 | { | |
36 | -#if defined(HAVE_SSE_INTRINSICS) | |
37 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE_MATH__) | |
38 | this->sse_state = _mm_getcsr(); | |
39 | unsigned int sseState = this->sse_state; | |
40 | sseState |= 0x8000; /* set flush-to-zero */ | |
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 @@ | |
53 | ||
54 | #include "config.h" | |
55 | ||
56 | -#ifdef HAVE_SSE_INTRINSICS | |
57 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) | |
58 | #include <xmmintrin.h> | |
59 | #endif | |
60 | ||
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()}; | |
70 | --- openal-soft-1.21.0/alc/uhjfilter.cpp.orig 2020-11-04 11:00:35.000000000 +0100 | |
71 | +++ openal-soft-1.21.0/alc/uhjfilter.cpp 2020-11-05 06:29:14.128492431 +0100 | |
72 | @@ -3,7 +3,7 @@ | |
73 | ||
74 | #include "uhjfilter.h" | |
75 | ||
76 | -#ifdef HAVE_SSE_INTRINSICS | |
77 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) | |
78 | #include <xmmintrin.h> | |
79 | #endif | |
80 | ||
81 | @@ -75,7 +75,7 @@ | |
82 | ||
83 | void allpass_process(al::span<float> dst, const float *RESTRICT src) | |
84 | { | |
85 | -#ifdef HAVE_SSE_INTRINSICS | |
86 | +#if defined(HAVE_SSE_INTRINSICS) && defined(__SSE__) | |
87 | size_t pos{0}; | |
88 | if(size_t todo{dst.size()>>1}) | |
89 | { |