diff options
| author | Chris Robinson <[email protected]> | 2014-02-23 21:17:09 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-02-23 21:17:09 -0800 |
| commit | 9a4ded249114007d07b8f96277a1fd50f2f48e6f (patch) | |
| tree | 5321731ad58fd0ad00471532e25407dafab44515 /Alc/mixer_inc.c | |
| parent | c68ce288d06372ff5cfd4c060c1f7b00058ca4d9 (diff) | |
Revert "Apply HRTF coefficient stepping separately"
This reverts commit 25b9c3d0c15e959d544f5d0ac7ea507ea5f6d69f.
Conflicts:
Alc/mixer_neon.c
Unfortunately this also undoes the Neon-enhanced ApplyCoeffsStep method.
Diffstat (limited to 'Alc/mixer_inc.c')
| -rw-r--r-- | Alc/mixer_inc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c index 08a7b264..da8a7b31 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer_inc.c @@ -19,9 +19,11 @@ #define MixDirect_Hrtf MERGE2(MixDirect_Hrtf_,SUFFIX) -static inline void ApplyCoeffsStep(const ALuint irSize, +static inline void ApplyCoeffsStep(ALuint Offset, ALfloat (*restrict Values)[2], + const ALuint irSize, ALfloat (*restrict Coeffs)[2], - const ALfloat (*restrict CoeffStep)[2]); + const ALfloat (*restrict CoeffStep)[2], + ALfloat left, ALfloat right); static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2], const ALuint irSize, ALfloat (*restrict Coeffs)[2], @@ -91,10 +93,9 @@ void MixDirect_Hrtf(const DirectParams *params, const ALfloat *restrict data, AL Values[(Offset+IrSize)&HRIR_MASK][1] = 0.0f; Offset++; - ApplyCoeffs(Offset, Values, IrSize, Coeffs, left, right); + ApplyCoeffsStep(Offset, Values, IrSize, Coeffs, CoeffStep, left, right); DryBuffer[FrontLeft][OutPos] += Values[Offset&HRIR_MASK][0]; DryBuffer[FrontRight][OutPos] += Values[Offset&HRIR_MASK][1]; - ApplyCoeffsStep(IrSize, Coeffs, CoeffStep); OutPos++; Counter--; |