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

Move a couple methods to where they're used

Browse Source
This commit is contained in:
Chris Robinson 2012-09-12 07:57:50 -07:00
parent 41f52fdd6a
commit ff809f2271
3 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Alc/ALu.c
View File

@ -36,6 +36,8 @@
#include "alu.h"
#include "bs2b.h"
#include "mixer_defs.h"
struct ChanMap {
enum Channel channel;
@ -49,6 +51,49 @@ ALfloat ConeScale = 1.0f;
ALfloat ZScale = 1.0f;
static DryMixerFunc SelectDirectMixer(void)
{
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
return MixDirect_SSE;
#endif
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
return MixDirect_Neon;
#endif
return MixDirect_C;
}
static DryMixerFunc SelectHrtfMixer(void)
{
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
return MixDirect_Hrtf_SSE;
#endif
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
return MixDirect_Hrtf_Neon;
#endif
return MixDirect_Hrtf_C;
}
static WetMixerFunc SelectSendMixer(void)
{
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
return MixSend_SSE;
#endif
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
return MixSend_Neon;
#endif
return MixSend_C;
}
static __inline ALvoid aluMatrixVector(ALfloat *vector,ALfloat w,ALfloat matrix[4][4])
{
ALfloat temp[4] = {

45
Alc/mixer.c
View File

@ -36,51 +36,6 @@
#include "alu.h"
#include "bs2b.h"
#include "mixer_defs.h"
DryMixerFunc SelectDirectMixer(void)
{
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
return MixDirect_SSE;
#endif
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
return MixDirect_Neon;
#endif
return MixDirect_C;
}
DryMixerFunc SelectHrtfMixer(void)
{
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
return MixDirect_Hrtf_SSE;
#endif
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
return MixDirect_Hrtf_Neon;
#endif
return MixDirect_Hrtf_C;
}
WetMixerFunc SelectSendMixer(void)
{
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
return MixSend_SSE;
#endif
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
return MixSend_Neon;
#endif
return MixSend_C;
}
static __inline ALfloat Sample_ALbyte(ALbyte val)
{ return val * (1.0f/127.0f); }

4
OpenAL32/Include/alu.h
View File

@ -268,10 +268,6 @@ ALvoid ComputeAngleGains(const ALCdevice *device, ALfloat angle, ALfloat hwidth,
ALvoid CalcSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext);
ALvoid CalcNonAttnSourceParams(struct ALsource *ALSource, const ALCcontext *ALContext);
DryMixerFunc SelectDirectMixer(void);
DryMixerFunc SelectHrtfMixer(void);
WetMixerFunc SelectSendMixer(void);
ALvoid MixSource(struct ALsource *Source, ALCdevice *Device, ALuint SamplesToDo);
ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size);