diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index d2f6be2f3a7e7..d99c68fb27ef5 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -990,8 +990,8 @@ set(pcsx2x86Sources x86/ix86-32/iR5900Shift.cpp x86/ix86-32/iR5900Templates.cpp x86/ix86-32/recVTLB.cpp - x86/newVif_Dynarec.cpp - x86/newVif_UnpackSSE.cpp + x86/Vif_Dynarec.cpp + x86/Vif_UnpackSSE.cpp ) # x86 headers @@ -1031,15 +1031,15 @@ set(pcsx2x86Headers x86/microVU_Tables.inl x86/microVU_Upper.inl x86/newVif.h - x86/newVif_UnpackSSE.h + x86/Vif_UnpackSSE.h x86/R5900_Profiler.h ) # ARM64 set(pcsx2arm64Sources arm64/AsmHelpers.cpp - arm64/newVif_Dynarec.cpp - arm64/newVif_UnpackNEON.cpp + arm64/Vif_Dynarec.cpp + arm64/Vif_UnpackNEON.cpp arm64/RecStubs.cpp ) diff --git a/pcsx2/Vif_Dynarec.h b/pcsx2/Vif_Dynarec.h index a18c7070b3505..33e4fb4f2700a 100644 --- a/pcsx2/Vif_Dynarec.h +++ b/pcsx2/Vif_Dynarec.h @@ -43,4 +43,4 @@ alignas(16) extern nVifStruct nVif[2]; alignas(16) extern nVifCall nVifUpk[(2 * 2 * 16) * 4]; // ([USN][Masking][Unpack Type]) [curCycle] alignas(16) extern u32 nVifMask[3][4][4]; // [MaskNumber][CycleNumber][Vector] -static constexpr bool newVifDynaRec = 1; // Use code in newVif_Dynarec.inl +static constexpr bool newVifDynaRec = 1; // Use code in Vif_Dynarec.inl diff --git a/pcsx2/arm64/newVif_Dynarec.cpp b/pcsx2/arm64/Vif_Dynarec.cpp similarity index 99% rename from pcsx2/arm64/newVif_Dynarec.cpp rename to pcsx2/arm64/Vif_Dynarec.cpp index eb68520da4e7f..ef620bd1d2e19 100644 --- a/pcsx2/arm64/newVif_Dynarec.cpp +++ b/pcsx2/arm64/Vif_Dynarec.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-License-Identifier: GPL-3.0 -#include "arm64/newVif_UnpackNEON.h" +#include "arm64/Vif_UnpackNEON.h" #include "arm64/AsmHelpers.h" #include "MTVU.h" diff --git a/pcsx2/arm64/newVif_UnpackNEON.cpp b/pcsx2/arm64/Vif_UnpackNEON.cpp similarity index 99% rename from pcsx2/arm64/newVif_UnpackNEON.cpp rename to pcsx2/arm64/Vif_UnpackNEON.cpp index 9b84df6c30c9c..f4ca4465fbfb6 100644 --- a/pcsx2/arm64/newVif_UnpackNEON.cpp +++ b/pcsx2/arm64/Vif_UnpackNEON.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-License-Identifier: GPL-3.0 -#include "newVif_UnpackNEON.h" +#include "Vif_UnpackNEON.h" #include "common/Perf.h" namespace a64 = vixl::aarch64; diff --git a/pcsx2/arm64/newVif_UnpackNEON.h b/pcsx2/arm64/Vif_UnpackNEON.h similarity index 100% rename from pcsx2/arm64/newVif_UnpackNEON.h rename to pcsx2/arm64/Vif_UnpackNEON.h diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj index c7f68793cf98d..1d2efe083b393 100644 --- a/pcsx2/pcsx2.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -117,10 +117,10 @@ true - + true - + true @@ -457,10 +457,10 @@ - + true - + true @@ -579,7 +579,7 @@ true - + true @@ -898,7 +898,7 @@ - + diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters index 51782a5fcf9d6..e72297d4b7e04 100644 --- a/pcsx2/pcsx2.vcxproj.filters +++ b/pcsx2/pcsx2.vcxproj.filters @@ -521,10 +521,10 @@ System\Ps2\EmotionEngine\DMAC\Vif\Unpack - + System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec - + System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec @@ -1425,10 +1425,10 @@ System\Ps2\GS\Renderers\Software - + System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec\arm64 - + System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec\arm64 @@ -1532,7 +1532,7 @@ System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif - + System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec @@ -2387,7 +2387,7 @@ System\Ps2\GS - + System\Ps2\EmotionEngine\DMAC\Vif\Unpack\newVif\Dynarec\arm64 diff --git a/pcsx2/x86/newVif_Dynarec.cpp b/pcsx2/x86/Vif_Dynarec.cpp similarity index 99% rename from pcsx2/x86/newVif_Dynarec.cpp rename to pcsx2/x86/Vif_Dynarec.cpp index ed8e548538912..e1ecc729dc9ef 100644 --- a/pcsx2/x86/newVif_Dynarec.cpp +++ b/pcsx2/x86/Vif_Dynarec.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-License-Identifier: GPL-3.0+ -#include "newVif_UnpackSSE.h" +#include "Vif_UnpackSSE.h" #include "MTVU.h" #include "common/Perf.h" #include "common/StringUtil.h" diff --git a/pcsx2/x86/newVif_UnpackSSE.cpp b/pcsx2/x86/Vif_UnpackSSE.cpp similarity index 99% rename from pcsx2/x86/newVif_UnpackSSE.cpp rename to pcsx2/x86/Vif_UnpackSSE.cpp index 68b52ce997da7..f5fab2ec831e7 100644 --- a/pcsx2/x86/newVif_UnpackSSE.cpp +++ b/pcsx2/x86/Vif_UnpackSSE.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team // SPDX-License-Identifier: GPL-3.0+ -#include "newVif_UnpackSSE.h" +#include "Vif_UnpackSSE.h" #include "common/Perf.h" #include "fmt/core.h" diff --git a/pcsx2/x86/newVif_UnpackSSE.h b/pcsx2/x86/Vif_UnpackSSE.h similarity index 100% rename from pcsx2/x86/newVif_UnpackSSE.h rename to pcsx2/x86/Vif_UnpackSSE.h