diff options
| author | kcat <[email protected]> | 2016-05-03 03:03:51 -0700 |
|---|---|---|
| committer | kcat <[email protected]> | 2016-05-03 03:03:51 -0700 |
| commit | dcdeb8d1a693125cdcc120beefdfea26ab1b94e8 (patch) | |
| tree | 8702eea48cf812e8a8d40c3ac0f74d353cabdac7 | |
| parent | d1e98c36d375433cb11a7a74ce20c968491773aa (diff) | |
| parent | b0224485aaecd0f98f61c0c77663ecba14302687 (diff) | |
Merge pull request #40 from rdb/master
Fix placement of alignas - fixes Mac OS X build
| -rw-r--r-- | Alc/mixer_sse2.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_sse3.c | 8 | ||||
| -rw-r--r-- | Alc/mixer_sse41.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Alc/mixer_sse2.c b/Alc/mixer_sse2.c index 32f29227..004dba9e 100644 --- a/Alc/mixer_sse2.c +++ b/Alc/mixer_sse2.c @@ -33,8 +33,8 @@ const ALfloat *Resample_lerp32_SSE2(const BsincState* UNUSED(state), const ALflo const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128 fracOne4 = _mm_set1_ps(1.0f/FRACTIONONE); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - alignas(16) union { ALuint i[4]; float f[4]; } pos_; - alignas(16) union { ALuint i[4]; float f[4]; } frac_; + union { alignas(16) ALuint i[4]; float f[4]; } pos_; + union { alignas(16) ALuint i[4]; float f[4]; } frac_; __m128i frac4, pos4; ALuint pos; ALuint i; diff --git a/Alc/mixer_sse3.c b/Alc/mixer_sse3.c index 7085c537..1b946461 100644 --- a/Alc/mixer_sse3.c +++ b/Alc/mixer_sse3.c @@ -36,8 +36,8 @@ const ALfloat *Resample_fir4_32_SSE3(const BsincState* UNUSED(state), const ALfl { const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - alignas(16) union { ALuint i[4]; float f[4]; } pos_; - alignas(16) union { ALuint i[4]; float f[4]; } frac_; + union { alignas(16) ALuint i[4]; float f[4]; } pos_; + union { alignas(16) ALuint i[4]; float f[4]; } frac_; __m128i frac4, pos4; ALuint pos; ALuint i; @@ -100,8 +100,8 @@ const ALfloat *Resample_fir8_32_SSE3(const BsincState* UNUSED(state), const ALfl { const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - alignas(16) union { ALuint i[4]; float f[4]; } pos_; - alignas(16) union { ALuint i[4]; float f[4]; } frac_; + union { alignas(16) ALuint i[4]; float f[4]; } pos_; + union { alignas(16) ALuint i[4]; float f[4]; } frac_; __m128i frac4, pos4; ALuint pos; ALuint i, j; diff --git a/Alc/mixer_sse41.c b/Alc/mixer_sse41.c index e832e5df..ed49447d 100644 --- a/Alc/mixer_sse41.c +++ b/Alc/mixer_sse41.c @@ -34,8 +34,8 @@ const ALfloat *Resample_lerp32_SSE41(const BsincState* UNUSED(state), const ALfl const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128 fracOne4 = _mm_set1_ps(1.0f/FRACTIONONE); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - alignas(16) union { ALuint i[4]; float f[4]; } pos_; - alignas(16) union { ALuint i[4]; float f[4]; } frac_; + union { alignas(16) ALuint i[4]; float f[4]; } pos_; + union { alignas(16) ALuint i[4]; float f[4]; } frac_; __m128i frac4, pos4; ALuint pos; ALuint i; @@ -89,8 +89,8 @@ const ALfloat *Resample_fir4_32_SSE41(const BsincState* UNUSED(state), const ALf { const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - alignas(16) union { ALuint i[4]; float f[4]; } pos_; - alignas(16) union { ALuint i[4]; float f[4]; } frac_; + union { alignas(16) ALuint i[4]; float f[4]; } pos_; + union { alignas(16) ALuint i[4]; float f[4]; } frac_; __m128i frac4, pos4; ALuint pos; ALuint i; @@ -156,8 +156,8 @@ const ALfloat *Resample_fir8_32_SSE41(const BsincState* UNUSED(state), const ALf { const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - alignas(16) union { ALuint i[4]; float f[4]; } pos_; - alignas(16) union { ALuint i[4]; float f[4]; } frac_; + union { alignas(16) ALuint i[4]; float f[4]; } pos_; + union { alignas(16) ALuint i[4]; float f[4]; } frac_; __m128i frac4, pos4; ALuint pos; ALuint i, j; |