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 #9889 from leoetlino/ax-symbols 

DSPHLE: Prevent AX GC and AX Wii symbol mixups
This commit is contained in:
Tilka 2021-07-13 01:41:44 +01:00 committed by GitHub
parent edc4396603 474adcc601
commit 8fcda4c315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
View File

@ -32,8 +32,14 @@ namespace DSP::HLE
#define MAX_SAMPLES_PER_FRAME 96 #define MAX_SAMPLES_PER_FRAME 96
#endif #endif
// Put all of that in an anonymous namespace to avoid stupid compilers merging // Use an inline namespace to prevent stupid compilers and debuggers from merging
// functions from AX GC and AX Wii. // functions from AX GC and AX Wii.
#ifdef AX_GC
inline namespace AXGC
#else
inline namespace AXWii
#endif
{
namespace namespace
{ {
// Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits. // Useful macro to convert xxx_hi + xxx_lo to xxx for 32 bits.
@ -541,4 +547,5 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
} }
} // namespace } // namespace
} // inline namespace AXGC/AXWii
} // namespace DSP::HLE } // namespace DSP::HLE