Browse Source

Really fix build

Signed-off-by: falkTX <falktx@falktx.com>
pull/1807/head
falkTX 1 year ago
parent
commit
d5a0063559
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      source/modules/zita-resampler/resampler.cc
  2. +2
    -2
      source/modules/zita-resampler/vresampler.cc

+ 2
- 2
source/modules/zita-resampler/resampler.cc View File

@@ -241,7 +241,7 @@ bool Resampler::process (void)
c1 = _table->_ctab + hl * ph; c1 = _table->_ctab + hl * ph;
c2 = _table->_ctab + hl * (np - ph); c2 = _table->_ctab + hl * (np - ph);


#if defined(__SSE2_MATH__)
#if defined(__SSE2_MATH__) && !defined(CARLA_OS_WIN)
__m128 C1, C2, Q1, Q2, S; __m128 C1, C2, Q1, Q2, S;
for (j = 0; j < _nchan; j++) for (j = 0; j < _nchan; j++)
{ {
@@ -262,7 +262,7 @@ bool Resampler::process (void)
*out_data++ = S [0] + S [1] + S [2] + S [3]; *out_data++ = S [0] + S [1] + S [2] + S [3];
} }


#elif defined(__ARM_NEON) || defined(__ARM_NEON__)
#elif (defined(__ARM_NEON) || defined(__ARM_NEON__)) && !defined(CARLA_OS_WIN)
// ARM64 version by Nicolas Belin <nbelin@baylibre.com> // ARM64 version by Nicolas Belin <nbelin@baylibre.com>
float32x4_t *C1 = (float32x4_t *)c1; float32x4_t *C1 = (float32x4_t *)c1;
float32x4_t *C2 = (float32x4_t *)c2; float32x4_t *C2 = (float32x4_t *)c2;


+ 2
- 2
source/modules/zita-resampler/vresampler.cc View File

@@ -251,7 +251,7 @@ bool VResampler::process (void)
q1 = _table->_ctab + hl * n; q1 = _table->_ctab + hl * n;
q2 = _table->_ctab + hl * (np - n); q2 = _table->_ctab + hl * (np - n);


#if defined(__SSE2_MATH__)
#if defined(__SSE2_MATH__) && !defined(CARLA_OS_WIN)
__m128 C1, C2, Q1, Q2, S; __m128 C1, C2, Q1, Q2, S;
C1 = _mm_load1_ps (&a); C1 = _mm_load1_ps (&a);
C2 = _mm_load1_ps (&b); C2 = _mm_load1_ps (&b);
@@ -285,7 +285,7 @@ bool VResampler::process (void)
*out_data++ = S [0] + S [1] + S [2] + S [3]; *out_data++ = S [0] + S [1] + S [2] + S [3];
} }


#elif defined(__ARM_NEON) || defined(__ARM_NEON__)
#elif (defined(__ARM_NEON) || defined(__ARM_NEON__)) && !defined(CARLA_OS_WIN)
// ARM64 version by Nicolas Belin <nbelin@baylibre.com> // ARM64 version by Nicolas Belin <nbelin@baylibre.com>
float32x4_t *C1 = (float32x4_t *)_c1; float32x4_t *C1 = (float32x4_t *)_c1;
float32x4_t *C2 = (float32x4_t *)_c2; float32x4_t *C2 = (float32x4_t *)_c2;


Loading…
Cancel
Save