From 8f9e04dc9db427d3784f09fdbaef61b46c85e8c4 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 12 Feb 2013 18:41:33 +0000
Subject: [PATCH] GSdx, SPU2-X: Remove old code and disable a now useless
 warning.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5559 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/GSdx/GSTextureCache.cpp | 17 -----------------
 plugins/GSdx/config.h           |  2 --
 plugins/spu2-x/src/Dma.cpp      |  5 +++--
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/plugins/GSdx/GSTextureCache.cpp b/plugins/GSdx/GSTextureCache.cpp
index d82ed1242f..9831fa5309 100644
--- a/plugins/GSdx/GSTextureCache.cpp
+++ b/plugins/GSdx/GSTextureCache.cpp
@@ -196,24 +196,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int
 
 		if(multiplier > 1) // it's limited to a maximum of 4 on reading the config
 		{
-
-#if 0 //#ifdef ENABLE_UPSCALE_HACKS //not happy with this yet..
-
-			float x = 1.0f;
-			float y = 1.0f;
-
-			switch(multiplier)
-			{
-				case 2: x = 1.9375; y = 2.0f; break; // x res get's rid of vertical lines in many games
-				case 3: x = 2.9375f; y = 2.9375f; break; // not helping much
-				case 4: x = 3.875f; y = 3.875f; break; // not helping much
-				default: __assume(0);
-			}
-
-			dst->m_texture->SetScale(GSVector2::_(x, y));
-#else
 			dst->m_texture->SetScale(GSVector2((float)multiplier, (float)multiplier));
-#endif
 		}
 		else
 		{
diff --git a/plugins/GSdx/config.h b/plugins/GSdx/config.h
index 7b5661fbc0..a11724fcb7 100644
--- a/plugins/GSdx/config.h
+++ b/plugins/GSdx/config.h
@@ -28,8 +28,6 @@
 //#define ENABLE_DYNAMIC_CRC_HACK
 #define DYNA_DLL_PATH "c:/dev/pcsx2/trunk/tools/dynacrchack/DynaCrcHack.dll"
 
-#define ENABLE_UPSCALE_HACKS // Hacks intended to fix upscaling / rendering glitches in HW renderers
-
 //#define DISABLE_HW_TEXTURE_CACHE // Slow but fixes a lot of bugs
 
 //#define DISABLE_BITMASKING
diff --git a/plugins/spu2-x/src/Dma.cpp b/plugins/spu2-x/src/Dma.cpp
index 141c41e9c6..766816c5f1 100644
--- a/plugins/spu2-x/src/Dma.cpp
+++ b/plugins/spu2-x/src/Dma.cpp
@@ -197,10 +197,11 @@ void V_Core::PlainDMAWrite(u16 *pMem, u32 size)
 	// but it could be indicative of an emulation foopah elsewhere.
 
 	if(MsgToConsole()) {
-		if((uptr)pMem & 15)
+		// Don't need this anymore. Target may still be good to know though.
+		/*if((uptr)pMem & 15)
 		{
 			ConLog("* SPU2 DMA Write > Misaligned source. Core: %d  IOP: %p  TSA: 0x%x  Size: 0x%x\n", Index, (void*)pMem, TSA, size);
-		}
+		}*/
 
 		if(TSA & 7)
 		{