Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid making static local copies of constexpr values

Browse Source
This commit is contained in:
Chris Robinson
2018-12-25 10:06:17 -08:00
parent 63df7cd537
commit 9e19acd9e1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/alu.cpp
+7 -7
View File
@@ -642,14 +642,14 @@ void CalcPanningAndFilters(ALvoice *voice, const ALfloat Azi, const ALfloat Elev
Elev, Spread, coeffs);
/* NOTE: W needs to be scaled due to FuMa normalization. */
ComputePanGains(&Device->FOAOut, coeffs, DryGain*AmbiScale::FromFuMa[0],
const ALfloat &scale0 = AmbiScale::FromFuMa[0];
ComputePanGains(&Device->FOAOut, coeffs, DryGain*scale0,
voice->Direct.Params[0].Gains.Target);
for(ALsizei i{0};i < NumSends;i++)
{
if(const ALeffectslot *Slot{SendSlots[i]})
ComputePanningGainsBF(Slot->ChanMap, Slot->NumChannels, coeffs,
WetGain[i]*AmbiScale::FromFuMa[0], voice->Send[i].Params[0].Gains.Target
);
WetGain[i]*scale0, voice->Send[i].Params[0].Gains.Target);
}
}
else
@@ -692,10 +692,10 @@ void CalcPanningAndFilters(ALvoice *voice, const ALfloat Azi, const ALfloat Elev
* matrix is transposed, for the inputs to align on the rows and
* outputs on the columns.
*/
static const ALfloat scale0{AmbiScale::FromFuMa[0]};
static const ALfloat scale1{AmbiScale::FromFuMa[1]};
static const ALfloat scale2{AmbiScale::FromFuMa[2]};
static const ALfloat scale3{AmbiScale::FromFuMa[3]};
const ALfloat &scale0 = AmbiScale::FromFuMa[0];
const ALfloat &scale1 = AmbiScale::FromFuMa[1];
const ALfloat &scale2 = AmbiScale::FromFuMa[2];
const ALfloat &scale3 = AmbiScale::FromFuMa[3];
const alu::Matrix matrix{
// ACN0 ACN1 ACN2 ACN3
scale0, 0.0f, 0.0f, 0.0f, // Ambi W