From c42330eebf3352e64890b6749142b030f9894fef Mon Sep 17 00:00:00 2001 From: Ziemas Date: Sun, 26 Oct 2025 20:25:50 +0100 Subject: [PATCH] SPU: Remove unused voice struct members Might as well If the saveversion is already being bumped. [SAVEVERSION+] --- pcsx2/SPU2/defs.h | 7 ------- pcsx2/SPU2/spu2sys.cpp | 1 - pcsx2/SaveState.h | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pcsx2/SPU2/defs.h b/pcsx2/SPU2/defs.h index 9bcbc08d95..ac2cd23caa 100644 --- a/pcsx2/SPU2/defs.h +++ b/pcsx2/SPU2/defs.h @@ -256,12 +256,6 @@ struct V_Voice // Sample pointer (19:12 bit fixed point) s32 SP; - // Sample pointer for Cubic Interpolation - // Cubic interpolation mixes a sample behind Linear, so that it - // can have sample data to either side of the end points from which - // to extrapolate. This SP represents that late sample position. - s32 SPc; - // Previous sample values - used for interpolation // Inverted order of these members to match the access order in the // code (might improve cache hits). @@ -272,7 +266,6 @@ struct V_Voice // Last outputted audio value, used for voice modulation. s32 OutX; - s32 NextCrest; // temp value for Crest calculation // SBuffer now points directly to an ADPCM cache entry. s16* SBuffer; diff --git a/pcsx2/SPU2/spu2sys.cpp b/pcsx2/SPU2/spu2sys.cpp index ed066c27d4..7126207cf1 100644 --- a/pcsx2/SPU2/spu2sys.cpp +++ b/pcsx2/SPU2/spu2sys.cpp @@ -228,7 +228,6 @@ void V_Voice::Start() PV1 = PV2 = 0; PV3 = PV4 = 0; - NextCrest = -0x8000; } void V_Voice::Stop() diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h index 229093c0f4..5bbf8d5360 100644 --- a/pcsx2/SaveState.h +++ b/pcsx2/SaveState.h @@ -26,7 +26,7 @@ enum class FreezeAction // [SAVEVERSION+] // This informs the auto updater that the users savestates will be invalidated. -static const u32 g_SaveVersion = (0x9A55 << 16) | 0x0000; +static const u32 g_SaveVersion = (0x9A56 << 16) | 0x0000; // the freezing data between submodules and core