ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10661 from Tilka/ax_init 

AX: refactor buffer initialization
This commit is contained in:
Mai M 2022-05-16 14:23:13 -04:00 committed by GitHub
parent b10808d815 ac7aeeece6
commit 4085d463a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
View File

@ -364,37 +364,18 @@ AXMixControl AXUCode::ConvertMixerControl(u32 mixer_control)
void AXUCode::SetupProcessing(u32 init_addr)
{
u16 init_data[0x20];
for (u32 i = 0; i < 0x20; ++i)
init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i);
// List of all buffers we have to initialize
int* buffers[] = {m_samples_main_left, m_samples_main_right, m_samples_main_surround,
m_samples_auxA_left, m_samples_auxA_right, m_samples_auxA_surround,
m_samples_auxB_left, m_samples_auxB_right, m_samples_auxB_surround};
u32 init_idx = 0;
for (auto& buffer : buffers)
{
s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]);
s16 delta = (s16)init_data[init_idx + 2];
init_idx += 3;
if (!init_val)
{
memset(buffer, 0, 5 * 32 * sizeof(int));
}
else
{
for (u32 j = 0; j < 32 * 5; ++j)
{
buffer[j] = init_val;
init_val += delta;
}
}
}
const std::array<BufferDesc, 9> buffers = {{
{m_samples_main_left, 32},
{m_samples_main_right, 32},
{m_samples_main_surround, 32},
{m_samples_auxA_left, 32},
{m_samples_auxA_right, 32},
{m_samples_auxA_surround, 32},
{m_samples_auxB_left, 32},
{m_samples_auxB_right, 32},
{m_samples_auxB_surround, 32},
}};
InitMixingBuffers<5 /*ms*/>(init_addr, buffers);
}
void AXUCode::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb)

28
Source/Core/Core/HW/DSPHLE/UCodes/AX.h
View File

@ -18,6 +18,7 @@
#include "Common/CommonTypes.h"
#include "Common/Swap.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h"
#include "Core/HW/Memmap.h"
namespace DSP::HLE
{
@ -141,6 +142,33 @@ protected:
virtual void HandleCommandList();
void SignalWorkEnd();
struct BufferDesc
{
int* ptr;
int samples_per_milli;
};
template <int Millis, size_t BufCount>
void InitMixingBuffers(u32 init_addr, const std::array<BufferDesc, BufCount>& buffers)
{
std::array<u16, 3 * BufCount> init_array;
Memory::CopyFromEmuSwapped(init_array.data(), init_addr, sizeof(init_array));
for (size_t i = 0; i < BufCount; ++i)
{
const BufferDesc& buf = buffers[i];
s32 value = s32((u32(init_array[3 * i]) << 16) | init_array[3 * i + 1]);
s16 delta = init_array[3 * i + 2];
if (value == 0)
{
memset(buf.ptr, 0, Millis * buf.samples_per_milli * sizeof(int));
}
else
{
for (int j = 0; j < Millis * buf.samples_per_milli; ++j)
buf.ptr[j] = value + j * delta;
}
}
}
void SetupProcessing(u32 init_addr);
void DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb);
void ProcessPBList(u32 pb_addr);

39
Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
View File

@ -253,18 +253,7 @@ void AXWiiUCode::HandleCommandList()
void AXWiiUCode::SetupProcessing(u32 init_addr)
{
// TODO: should be easily factorizable with AX
s16 init_data[60];
for (u32 i = 0; i < 60; ++i)
init_data[i] = HLEMemory_Read_U16(init_addr + 2 * i);
// List of all buffers we have to initialize
struct
{
int* ptr;
u32 samples;
} buffers[] = {
const std::array<BufferDesc, 20> buffers = {{
{m_samples_main_left, 32}, {m_samples_main_right, 32}, {m_samples_main_surround, 32},
{m_samples_auxA_left, 32}, {m_samples_auxA_right, 32}, {m_samples_auxA_surround, 32},
{m_samples_auxB_left, 32}, {m_samples_auxB_right, 32}, {m_samples_auxB_surround, 32},
@ -272,29 +261,9 @@ void AXWiiUCode::SetupProcessing(u32 init_addr)
{m_samples_wm0, 6}, {m_samples_aux0, 6}, {m_samples_wm1, 6},
{m_samples_aux1, 6}, {m_samples_wm2, 6}, {m_samples_aux2, 6},
{m_samples_wm3, 6}, {m_samples_aux3, 6}};
u32 init_idx = 0;
for (auto& buffer : buffers)
{
s32 init_val = (s32)((init_data[init_idx] << 16) | init_data[init_idx + 1]);
s16 delta = (s16)init_data[init_idx + 2];
init_idx += 3;
if (!init_val)
{
memset(buffer.ptr, 0, 3 * buffer.samples * sizeof(int));
}
else
{
for (u32 j = 0; j < 3 * buffer.samples; ++j)
{
buffer.ptr[j] = init_val;
init_val += delta;
}
}
}
{m_samples_wm3, 6}, {m_samples_aux3, 6},
}};
InitMixingBuffers<3 /*ms*/>(init_addr, buffers);
}
void AXWiiUCode::AddToLR(u32 val_addr, bool neg)