mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-25 15:41:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12465 from Tilka/zelda

Browse Source 
DSPHLE/Zelda: fix use of wrong reverb buffer
This commit is contained in:
Tilka 2023-12-29 08:14:55 +01:00 committed by GitHub
commit 68250afa08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
View File

@ -950,6 +950,7 @@ struct ReverbPB
// Base address of the circular buffer in MRAM. // Base address of the circular buffer in MRAM.
u16 circular_buffer_base_h; u16 circular_buffer_base_h;
u16 circular_buffer_base_l; u16 circular_buffer_base_l;
DEFINE_32BIT_ACCESSOR(circular_buffer_base, CircularBufferBase)
struct Destination struct Destination
{ {
@ -990,7 +991,7 @@ void ZeldaAudioRenderer::PrepareFrame()
0xB820); 0xB820);
AddBuffersWithVolume(m_buf_front_left_reverb.data(), m_buf_back_right_reverb.data() + 0x28, 0x28, AddBuffersWithVolume(m_buf_front_left_reverb.data(), m_buf_back_right_reverb.data() + 0x28, 0x28,
0xB820); 0xB820);
AddBuffersWithVolume(m_buf_front_right_reverb.data(), m_buf_back_left_reverb.data() + 0x28, 0x28, AddBuffersWithVolume(m_buf_front_right_reverb.data(), m_buf_back_right_reverb.data() + 0x28, 0x28,
0x7FFF); 0x7FFF);
m_buf_back_left_reverb.fill(0); m_buf_back_left_reverb.fill(0);
m_buf_back_right_reverb.fill(0); m_buf_back_right_reverb.fill(0);
@ -1059,8 +1060,7 @@ void ZeldaAudioRenderer::ApplyReverb(bool post_rendering)
u16 mram_buffer_idx = m_reverb_pb_frames_count[rpb_idx]; u16 mram_buffer_idx = m_reverb_pb_frames_count[rpb_idx];
u32 mram_addr = ((rpb.circular_buffer_base_h << 16) | rpb.circular_buffer_base_l) + u32 mram_addr = rpb.GetCircularBufferBase() + mram_buffer_idx * 0x50 * sizeof(s16);
mram_buffer_idx * 0x50 * sizeof(s16);
s16* mram_ptr = (s16*)HLEMemory_Get_Pointer(mram_addr); s16* mram_ptr = (s16*)HLEMemory_Get_Pointer(mram_addr);
if (!post_rendering) if (!post_rendering)