Merged common texture cache code from video plugins into VideoCommon. (DX11 native mipmaps currently broken, disabled) Hopefully everything else should still be working.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6288 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/VideoCommon/Src/HiresTextures.cpp

@@ -95,7 +95,7 @@ void Shutdown()
 	textureMap.clear();
 }
 
-PC_TexFormat GetHiresTex(const char *fileName, int *pWidth, int *pHeight, int texformat, u8 *data)
+PC_TexFormat GetHiresTex(const char *fileName, unsigned int *pWidth, unsigned int *pHeight, int texformat, u8 *data)
 {
 	std::string key(fileName);
 

Source/Core/VideoCommon/Src/HiresTextures.h

@@ -26,7 +26,7 @@ namespace HiresTextures
 {
 void Init(const char *gameCode);
 void Shutdown();
-PC_TexFormat GetHiresTex(const char *fileName, int *pWidth, int *pHeight, int texformat, u8 *data);
+PC_TexFormat GetHiresTex(const char *fileName, unsigned int *pWidth, unsigned int *pHeight, int texformat, u8 *data);
 
 };
 

Source/Core/VideoCommon/Src/SConscript

@@ -30,6 +30,7 @@ files = [
 	'TextureConversionShader.cpp',
 	'ImageWrite.cpp',
 	'VertexManagerBase.cpp',
+	'TextureCacheBase.cpp',
 	'Statistics.cpp',
 	'Fifo.cpp',
 	'VideoState.cpp',

Source/Core/VideoCommon/Src/TextureCacheBase.h

@@ -0,0 +1,99 @@
+
+#ifndef _TEXTURECACHEBASE_H
+#define _TEXTURECACHEBASE_H
+
+#include <map>
+
+//#include "VideoCommon.h"
+#include "TextureDecoder.h"
+#include "BPMemory.h"
+
+#include "CommonTypes.h"
+
+class TextureCache
+{
+public:
+	struct TCacheEntryBase
+	{
+		// TODO: organize
+		u32 addr;
+		u32 size_in_bytes;
+		u64 hash;
+		//u32 paletteHash;
+		u32 oldpixel;
+		u32 format;
+		
+		int frameCount;
+		unsigned int w, h, mipLevels;
+		// TODO: it looks like scaledW/H can be removed and w/h can be used in their place
+		unsigned int scaledW, scaledH, nativeW, nativeH;
+
+		bool isRenderTarget;
+		bool isDynamic; // mofified from cpu
+		bool isNonPow2;	// doesn't seem to be used anywhere
+
+		//TCacheEntryBase()
+		//{
+		//	// TODO: remove these
+		//	isRenderTarget = 0;
+		//	hash = 0;
+		//	//paletteHash = 0;
+		//	oldpixel = 0;
+		//	addr = 0;
+		//	size_in_bytes = 0;
+		//	frameCount = 0;
+		//	isNonPow2 = true;
+		//	w = 0;
+		//	h = 0;
+		//	scaledW = 0;
+		//	scaledH = 0;
+		//}
+
+		virtual ~TCacheEntryBase();
+
+		virtual void Bind(unsigned int stage) = 0;
+		virtual bool Save(const char filename[]) = 0;
+
+		virtual void Load(unsigned int width, unsigned int height,
+			unsigned int expanded_width, unsigned int level) = 0;
+		virtual void FromRenderTarget(bool bFromZBuffer, bool bScaleByHalf,
+			unsigned int cbufid, const float *colmat, const EFBRectangle &source_rect,
+			bool bIsIntensityFmt, u32 copyfmt) = 0;
+
+		int IntersectsMemoryRange(u32 range_address, u32 range_size) const;
+	};
+
+	virtual ~TextureCache(); // needs virtual for DX11 dtor
+
+	static void Cleanup();
+
+	static void Invalidate(bool shutdown);
+	static void InvalidateRange(u32 start_address, u32 size);
+	static void MakeRangeDynamic(u32 start_address, u32 size);
+	static void ClearRenderTargets();	// currently only used by OGL
+
+	virtual TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
+		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt) = 0;
+	virtual TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h) = 0;
+
+	static TCacheEntryBase* Load(unsigned int stage, u32 address, unsigned int width, unsigned int height,
+		int format, unsigned int tlutaddr, int tlutfmt, bool UseNativeMips, unsigned int maxlevel);
+	static void CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool bIsIntensityFmt,
+		u32 copyfmt, bool bScaleByHalf, const EFBRectangle &source_rect);
+
+protected:
+	TextureCache();
+
+	static u8 *temp;
+
+private:
+	typedef std::map<u32, TCacheEntryBase*> TexCache;
+
+	static TexCache textures;
+
+	virtual bool isOGL() { return false; }	// Hacks for TextureDecode_real support
+};
+
+extern TextureCache *g_texture_cache;
+
+#endif

Source/Core/VideoCommon/Src/VertexManagerBase.cpp

@@ -4,6 +4,12 @@
 #include "Statistics.h"
 #include "OpcodeDecoding.h"
 #include "IndexGenerator.h"
+#include "VertexShaderManager.h"
+#include "PixelShaderManager.h"
+#include "NativeVertexFormat.h"
+#include "TextureCacheBase.h"
+#include "Render.h"
+#include "Profiler.h"
 
 #include "VertexManagerBase.h"
 
@@ -151,8 +157,158 @@ void VertexManager::AddVertices(int primitive, int numVertices)
 	AddIndices(primitive, numVertices);
 }
 
-// TODO: merge this func, (need to merge TextureCache)
 void VertexManager::Flush()
 {
 	g_vertex_manager->vFlush();
 }
+
+// TODO: need to merge more stuff into VideoCommon to use this
+#if (0)
+void VertexManager::Flush()
+{
+	if (LocalVBuffer == s_pCurBufferPointer || Flushed)
+		return;
+
+	Flushed = true;
+
+	VideoFifo_CheckEFBAccess();
+
+#if defined(_DEBUG) || defined(DEBUGFAST) 
+	PRIM_LOG("frame%d:\n texgen=%d, numchan=%d, dualtex=%d, ztex=%d, cole=%d, alpe=%d, ze=%d", g_ActiveConfig.iSaveTargetId, xfregs.numTexGens,
+		xfregs.nNumChans, (int)xfregs.bEnableDualTexTransform, bpmem.ztex2.op,
+		bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate, bpmem.zmode.updateenable);
+
+	for (int i = 0; i < xfregs.nNumChans; ++i) 
+	{
+		LitChannel* ch = &xfregs.colChans[i].color;
+		PRIM_LOG("colchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
+		ch = &xfregs.colChans[i].alpha;
+		PRIM_LOG("alpchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
+	}
+
+	for (int i = 0; i < xfregs.numTexGens; ++i) 
+	{
+		TexMtxInfo tinfo = xfregs.texcoords[i].texmtxinfo;
+		if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) tinfo.hex &= 0x7ff;
+		if (tinfo.texgentype != XF_TEXGEN_REGULAR) tinfo.projection = 0;
+
+		PRIM_LOG("txgen%d: proj=%d, input=%d, gentype=%d, srcrow=%d, embsrc=%d, emblght=%d, postmtx=%d, postnorm=%d",
+			i, tinfo.projection, tinfo.inputform, tinfo.texgentype, tinfo.sourcerow, tinfo.embosssourceshift, tinfo.embosslightshift,
+			xfregs.texcoords[i].postmtxinfo.index, xfregs.texcoords[i].postmtxinfo.normalize);
+	}
+
+	PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphafunc=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages,
+		bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alphaFunc.hex>>16)&0xff);
+#endif
+
+	DVSTARTPROFILE();
+
+	// set the textures
+	DVSTARTSUBPROFILE("VertexManager::Flush:textures");
+
+	u32 usedtextures = 0;
+	for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
+		if (bpmem.tevorders[i / 2].getEnable(i & 1))
+			usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
+
+	if (bpmem.genMode.numindstages > 0)
+		for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
+			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
+				usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt);
+
+	for (u32 i = 0; i < 8; ++i)
+	{
+		if (usedtextures & (1 << i))
+		{
+			// TODO:
+			//glActiveTexture(GL_TEXTURE0 + i);
+
+			Renderer::SetSamplerState(i & 3, i >> 2);
+			FourTexUnits &tex = bpmem.tex[i >> 2];
+
+			TCacheEntry::TCacheEntryBase* tentry = TextureCache::Load(i, 
+				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
+				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
+				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, 
+				tex.texTlut[i&3].tlut_format,
+				(tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8) && g_ActiveConfig.bUseNativeMips,
+				(tex.texMode1[i&3].max_lod >> 4));
+
+			if (tentry)
+			{
+				// 0s are probably for no manual wrapping needed.
+				PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
+
+				// TODO:
+				//if (g_ActiveConfig.iLog & CONF_SAVETEXTURES) 
+				//{
+				//	// save the textures
+				//	char strfile[255];
+				//	sprintf(strfile, "%stex%.3d_%d.tga", File::GetUserPath(D_DUMPFRAMES_IDX), g_Config.iSaveTargetId, i);
+				//	SaveTexture(strfile, GL_TEXTURE_2D, tentry->texture, tentry->w, tentry->h);
+				//}
+			}
+			else
+				ERROR_LOG(VIDEO, "error loading texture");
+		}
+	}
+
+	// set global constants
+	VertexShaderManager::SetConstants();
+	PixelShaderManager::SetConstants();
+
+	// finally bind
+	if (false == PixelShaderCache::SetShader(false, g_nativeVertexFmt->m_components))
+		goto shader_fail;
+	if (false == VertexShaderCache::SetShader(g_nativeVertexFmt->m_components))
+		goto shader_fail;
+
+	const int stride = g_nativeVertexFmt->GetVertexStride();
+	//if (g_nativeVertexFmt)
+		g_nativeVertexFmt->SetupVertexPointers();
+
+	g_vertex_manager->Draw(stride, false);
+
+	// run through vertex groups again to set alpha
+	if (false == g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate)
+	{
+		if (false == PixelShaderCache::SetShader(true, g_nativeVertexFmt->m_components))
+			goto shader_fail;
+
+		g_vertex_manager->Draw(stride, true);
+	}
+
+	// TODO:
+	//IndexGenerator::Start(TIBuffer, LIBuffer, PIBuffer);
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (g_ActiveConfig.iLog & CONF_SAVESHADERS) 
+	{
+		// save the shaders
+		char strfile[255];
+		sprintf(strfile, "%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX), g_ActiveConfig.iSaveTargetId);
+		std::ofstream fps(strfile);
+		fps << ps->strprog.c_str();
+		sprintf(strfile, "%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX), g_ActiveConfig.iSaveTargetId);
+		std::ofstream fvs(strfile);
+		fvs << vs->strprog.c_str();
+	}
+
+	if (g_ActiveConfig.iLog & CONF_SAVETARGETS) 
+	{
+		char str[128];
+		sprintf(str, "%starg%.3d.tga", File::GetUserPath(D_DUMPFRAMES_IDX), g_ActiveConfig.iSaveTargetId);
+		TargetRectangle tr;
+		tr.left = 0;
+		tr.right = Renderer::GetTargetWidth();
+		tr.top = 0;
+		tr.bottom = Renderer::GetTargetHeight();
+		Renderer::SaveRenderTarget(str, tr);
+	}
+#endif
+	++g_Config.iSaveTargetId;
+
+shader_fail:
+	ResetBuffer();
+}
+#endif

Source/Core/VideoCommon/Src/VertexManagerBase.h

@@ -48,8 +48,10 @@ protected:
 
 private:
 	static void AddIndices(int primitive, int numVertices);
-	// temporary
+	//virtual void Draw(u32 stride, bool alphapass) = 0;
+	// temp
 	virtual void vFlush() = 0;
+
 };
 
 extern VertexManager *g_vertex_manager;

Source/Core/VideoCommon/VideoCommon.vcproj

@@ -730,6 +730,14 @@
 		<Filter
 			Name="Base"
 			>
+			<File
+				RelativePath=".\Src\TextureCacheBase.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\TextureCacheBase.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\VertexManagerBase.cpp"
 				>

Source/Plugins/Plugin_VideoDX11/Src/BPFunctions.cpp

@@ -80,7 +80,7 @@ void CopyEFB(const BPCmd &bp, const EFBRectangle &rc, const u32 &address, const
 	// bpmem.zcontrol.pixel_format to PIXELFMT_Z24 is when the game wants to copy from ZBuffer (Zbuffer uses 24-bit Format)
 	if (!g_ActiveConfig.bEFBCopyDisable)
 	{
-		TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, scaleByHalf, rc);		
+		TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, !!scaleByHalf, rc);
 	}
 }
 

Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h

@@ -24,45 +24,42 @@
 #include "VideoCommon.h"
 #include "BPMemory.h"
 
-class TextureCache
+#include "TextureCacheBase.h"
+
+namespace DX11
+{
+
+class TextureCache : public ::TextureCache
 {
 public:
-	struct TCacheEntry
-	{
-		D3DTexture2D* texture;
-
-		u32 addr;
-		u32 size_in_bytes;
-		u64 hash;
-		u32 paletteHash;
-		u32 oldpixel;
-		
-		int frameCount;
-		unsigned int w, h, fmt, MipLevels;
-		int Realw, Realh, Scaledw, Scaledh;
-
-		bool isRenderTarget;
-		bool isNonPow2;
-
-		TCacheEntry() : texture(NULL), addr(0), size_in_bytes(0), hash(0), paletteHash(0), oldpixel(0),
-						frameCount(0), w(0), h(0), fmt(0), MipLevels(0), Realw(0), Realh(0), Scaledw(0), Scaledh(0),
-						isRenderTarget(false), isNonPow2(true) {}
-
-		void Destroy(bool shutdown);
-		bool IntersectsMemoryRange(u32 range_address, u32 range_size);
-	};
-
-	static void Init();
-	static void Cleanup();
-	static void Shutdown();
-	static void Invalidate(bool shutdown);
-	static void InvalidateRange(u32 start_address, u32 size);
-	static TCacheEntry* TextureCache::Load(unsigned int stage, u32 address, unsigned int width, unsigned int height, unsigned int tex_format, unsigned int tlutaddr, unsigned int tlutfmt, bool UseNativeMips, unsigned int maxlevel);
-	static void CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, unsigned int bScaleByHalf, const EFBRectangle &source_rect);
+	TextureCache();
+	~TextureCache();
 
 private:
-	typedef std::map<u32,TCacheEntry> TexCache;
+	struct TCacheEntry : TCacheEntryBase
+	{
+		D3DTexture2D *const texture;
 
-	static u8* temp;
-	static TexCache textures;
+		D3D11_USAGE usage;
+
+		TCacheEntry(D3DTexture2D *_tex) : texture(_tex) {}
+		~TCacheEntry();
+
+		void Load(unsigned int width, unsigned int height,
+			unsigned int expanded_width, unsigned int levels);
+
+		void FromRenderTarget(bool bFromZBuffer, bool bScaleByHalf,
+			unsigned int cbufid, const float* colmat, const EFBRectangle &source_rect,
+			bool bIsIntensityFmt, u32 copyfmt);
+
+		void Bind(unsigned int stage);
+		bool Save(const char filename[]);
+	};
+
+	TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
+		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt);
+
+	TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h);
 };
+
+}

Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp

@@ -214,7 +214,7 @@ void VertexManager::vFlush()
 		{
 			Renderer::SetSamplerState(i & 3, i >> 2);
 			FourTexUnits &tex = bpmem.tex[i >> 2];
-			TextureCache::TCacheEntry* tentry = TextureCache::Load(i, 
+			TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i, 
 				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
 				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
 				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, 
@@ -225,7 +225,7 @@ void VertexManager::vFlush()
 			if (tentry)
 			{
 				// 0s are probably for no manual wrapping needed.
-				PixelShaderManager::SetTexDims(i, tentry->Realw, tentry->Realh, 0, 0);
+				PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
 			}
 			else
 				ERROR_LOG(VIDEO, "error loading texture");

Source/Plugins/Plugin_VideoDX11/Src/main.cpp

@@ -215,7 +215,7 @@ void Video_Prepare()
 
 	// internal interfaces
 	Renderer::Init();
-	TextureCache::Init();
+	g_texture_cache = new DX11::TextureCache;
 	g_vertex_manager = new DX11::VertexManager;
 	VertexShaderCache::Init();
 	PixelShaderCache::Init();
@@ -258,7 +258,7 @@ void Shutdown()
 	PixelShaderCache::Shutdown();
 	VertexShaderCache::Shutdown();
 	delete g_vertex_manager;
-	TextureCache::Shutdown();
+	delete g_texture_cache;
 	Renderer::Shutdown();
 	EmuWindow::Close();
 

Source/Plugins/Plugin_VideoDX9/Src/BPFunctions.cpp

@@ -85,7 +85,7 @@ void CopyEFB(const BPCmd &bp, const EFBRectangle &rc, const u32 &address, const
 	// bpmem.zcontrol.pixel_format to PIXELFMT_Z24 is when the game wants to copy from ZBuffer (Zbuffer uses 24-bit Format)
 	if (!g_ActiveConfig.bEFBCopyDisable)
 	{
-		TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, scaleByHalf, rc);		
+		TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, !!scaleByHalf, rc);
 	}
 }
 

Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h

@@ -25,64 +25,41 @@
 #include "VideoCommon.h"
 #include "BPMemory.h"
 
-class TextureCache
+#include "TextureCacheBase.h"
+
+namespace DX9
 {
-public:
-	struct TCacheEntry
+
+class TextureCache : public ::TextureCache
+{
+private:
+	struct TCacheEntry : TCacheEntryBase
 	{
-		LPDIRECT3DTEXTURE9 texture;
+		const LPDIRECT3DTEXTURE9 texture;
 
-		u32 addr;
-		u32 size_in_bytes;
-		u64 hash;
-		u32 paletteHash;
-		u32 oldpixel;
-		
-		int frameCount;
-		int w, h, fmt,MipLevels, Realw, Realh, Scaledw, Scaledh;
+		D3DFORMAT d3d_fmt;
+		bool swap_r_b;
 
-		bool isRenderTarget;
-		bool isDynamic;// mofified from cpu
-		bool isNonPow2;
+		TCacheEntry(LPDIRECT3DTEXTURE9 _tex) : texture(_tex) {}
+		~TCacheEntry();
 
-		TCacheEntry()
-		{
-			texture = 0;
-			isRenderTarget = 0;
-			hash = 0;
-			paletteHash = 0;
-			oldpixel = 0;
-			addr = 0;
-			size_in_bytes = 0;
-			frameCount = 0;
-			isNonPow2 = true;
-			w = 0;
-			h = 0;
-			Realw = 0;
-			Realh = 0;
-			Scaledw = 0;
-			Scaledh = 0;
-		}
-		void Destroy(bool shutdown);
-		int IntersectsMemoryRange(u32 range_address, u32 range_size);
+		void Load(unsigned int width, unsigned int height,
+			unsigned int expanded_width, unsigned int levels);
+
+		void FromRenderTarget(bool bFromZBuffer, bool bScaleByHalf,
+			unsigned int cbufid, const float* colmat, const EFBRectangle &source_rect,
+			bool bIsIntensityFmt, u32 copyfmt);
+
+		void Bind(unsigned int stage);
+		bool Save(const char filename[]);
 	};
 
-private:
+	TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
+		unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt);
 
-	typedef std::map<u32,TCacheEntry> TexCache;
-
-	static u8 *temp;
-	static TexCache textures;
-
-public:
-	static void Init();
-	static void Cleanup();
-	static void Shutdown();
-	static void Invalidate(bool shutdown);
-	static void InvalidateRange(u32 start_address, u32 size);
-	static void MakeRangeDynamic(u32 start_address, u32 size);
-	static TCacheEntry *Load(int stage, u32 address, int width, int height, int format, int tlutaddr, int tlutfmt,bool UseNativeMips, int maxlevel);
-	static void CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle &source_rect);
+	TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h);
 };
 
+}
+
 #endif

Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp

@@ -133,7 +133,7 @@ void VertexManager::vFlush()
 		{
 			Renderer::SetSamplerState(i & 3, i >> 2);
 			FourTexUnits &tex = bpmem.tex[i >> 2];
-			TextureCache::TCacheEntry* tentry = TextureCache::Load(i, 
+			TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i, 
 				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
 				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
 				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, 
@@ -144,7 +144,7 @@ void VertexManager::vFlush()
 			if (tentry)
 			{
 				// 0s are probably for no manual wrapping needed.
-				PixelShaderManager::SetTexDims(i, tentry->Realw, tentry->Realh, 0, 0);
+				PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
 			}
 			else
 				ERROR_LOG(VIDEO, "error loading texture");

Source/Plugins/Plugin_VideoDX9/Src/main.cpp

@@ -238,7 +238,7 @@ void Video_Prepare()
 
 	// internal interfaces
 	Renderer::Init();
-	TextureCache::Init();
+	g_texture_cache = new DX9::TextureCache;
 	g_vertex_manager = new DX9::VertexManager;
 	// VideoCommon
 	BPInit();
@@ -276,7 +276,7 @@ void Shutdown()
 	PixelShaderCache::Shutdown();
 	VertexShaderCache::Shutdown();
 	delete g_vertex_manager;
-	TextureCache::Shutdown();
+	delete g_texture_cache;
 	Renderer::Shutdown();
 	D3D::Shutdown();
 	EmuWindow::Close();

Source/Plugins/Plugin_VideoOGL/Src/BPFunctions.cpp

@@ -83,7 +83,7 @@ void CopyEFB(const BPCmd &bp, const EFBRectangle &rc, const u32 &address, const
 	// bpmem.zcontrol.pixel_format to PIXELFMT_Z24 is when the game wants to copy from ZBuffer (Zbuffer uses 24-bit Format)
 	if (!g_ActiveConfig.bEFBCopyDisable)
 	{
-		TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, scaleByHalf, rc);		
+		TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, !!scaleByHalf, rc);
 	}
 }
 

Source/Plugins/Plugin_VideoOGL/Src/Render.cpp

@@ -1082,7 +1082,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 
 	// Disable all other stages
 	for (int i = 1; i < 8; ++i)
-		TextureCache::DisableStage(i);
+		OGL::TextureCache::DisableStage(i);
 
 	// Update GLViewPort
 	glViewport(dst_rect.left, dst_rect.bottom, dst_rect.GetWidth(), dst_rect.GetHeight());
@@ -1246,7 +1246,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	}
 
 	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
-	TextureCache::DisableStage(0);
+	OGL::TextureCache::DisableStage(0);
 
 	// Wireframe
 	if (g_ActiveConfig.bWireFrame)