From 64d499af6e4353b84b8749083ab9c0b55ad5f30d Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Wed, 7 Sep 2016 19:00:15 +0200 Subject: [PATCH] pcsx2|spu2x: remove unused macro --- pcsx2/IPU/mpeg2lib/Idct.cpp | 2 -- pcsx2/VU0.cpp | 5 ----- pcsx2/VU0micro.cpp | 2 -- pcsx2/VU1micro.cpp | 2 -- plugins/spu2-x/src/ADSR.cpp | 2 -- 5 files changed, 13 deletions(-) diff --git a/pcsx2/IPU/mpeg2lib/Idct.cpp b/pcsx2/IPU/mpeg2lib/Idct.cpp index 4bbf32f3bd..c74b0837f4 100644 --- a/pcsx2/IPU/mpeg2lib/Idct.cpp +++ b/pcsx2/IPU/mpeg2lib/Idct.cpp @@ -38,8 +38,6 @@ #define W5 1609 /* 2048*sqrt (2)*cos (5*pi/16) */ #define W6 1108 /* 2048*sqrt (2)*cos (6*pi/16) */ #define W7 565 /* 2048*sqrt (2)*cos (7*pi/16) */ -#define clp(val,res) res = (val < 0) ? 0 : ((val > 255) ? 255 : val); -#define clp2(val,res) res = (val < -255) ? -255 : ((val > 255) ? 255 : val); /* * In legal streams, the IDCT output should be between -384 and +384. diff --git a/pcsx2/VU0.cpp b/pcsx2/VU0.cpp index 40bd817cc8..556a2ecd87 100644 --- a/pcsx2/VU0.cpp +++ b/pcsx2/VU0.cpp @@ -35,11 +35,6 @@ #define _Fs_ _Rd_ #define _Fd_ _Sa_ -#define _X (cpuRegs.code>>24) & 0x1 -#define _Y (cpuRegs.code>>23) & 0x1 -#define _Z (cpuRegs.code>>22) & 0x1 -#define _W (cpuRegs.code>>21) & 0x1 - #define _Fsf_ ((cpuRegs.code >> 21) & 0x03) #define _Ftf_ ((cpuRegs.code >> 23) & 0x03) diff --git a/pcsx2/VU0micro.cpp b/pcsx2/VU0micro.cpp index d9e5d853f6..259db16c73 100644 --- a/pcsx2/VU0micro.cpp +++ b/pcsx2/VU0micro.cpp @@ -26,8 +26,6 @@ using namespace R5900; -#define VF_VAL(x) ((x==0x80000000)?0:(x)) - // This is called by the COP2 as per the CTC instruction void vu0ResetRegs() { diff --git a/pcsx2/VU1micro.cpp b/pcsx2/VU1micro.cpp index 94dce0af1f..6dfb72a4dd 100644 --- a/pcsx2/VU1micro.cpp +++ b/pcsx2/VU1micro.cpp @@ -27,8 +27,6 @@ u32 vudump = 0; #endif -#define VF_VAL(x) ((x==0x80000000)?0:(x)) - // This is called by the COP2 as per the CTC instruction void vu1ResetRegs() { diff --git a/plugins/spu2-x/src/ADSR.cpp b/plugins/spu2-x/src/ADSR.cpp index b0012fb729..beb0219de3 100644 --- a/plugins/spu2-x/src/ADSR.cpp +++ b/plugins/spu2-x/src/ADSR.cpp @@ -38,8 +38,6 @@ void InitADSR() // INIT ADSR } } -#define VOL(x) (((s32)x)) //24.8 volume - // Returns the linear slide value for AR and SR inputs. // (currently not used, it's buggy) static int GetLinearSrAr( uint SrAr )