Minor code formatting:

First step to bring a level of consistency between the video plug-ins - variable names, spacing, function names, function order, comments, file names.  This will help us identify common code for VideoMerge.

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

Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj

@@ -716,11 +716,11 @@
 			Name="Render"
 			>
 			<File
-				RelativePath=".\Src\FBManager.cpp"
+				RelativePath=".\Src\FramebufferManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Src\FBManager.h"
+				RelativePath=".\Src\FramebufferManager.h"
 				>
 			</File>
 			<File

Source/Plugins/Plugin_VideoDX11/Src/BPFunctions.cpp

@@ -16,16 +16,21 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "BPFunctions.h"
-#include "D3DBase.h"
-#include "VideoConfig.h"
 #include "Common.h"
+#include "D3DBase.h"
+#include "Render.h"
 #include "TextureCache.h"
 #include "VertexManager.h"
 #include "VertexShaderManager.h"
-#include "Render.h"
+#include "VideoConfig.h"
 
 namespace BPFunctions
 {
+// ----------------------------------------------
+// State translation lookup tables
+// Reference: Yet Another Gamecube Documentation
+// ----------------------------------------------
+
 
 void FlushPipeline()
 {
@@ -72,21 +77,18 @@ void SetColorMask(const BPCmd &bp)
 
 void CopyEFB(const BPCmd &bp, const EFBRectangle &rc, const u32 &address, const bool &fromZBuffer, const bool &isIntensityFmt, const u32 &copyfmt, const int &scaleByHalf)
 {
+	// 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)
 	{
-//		if (g_ActiveConfig.bCopyEFBToTexture)
-//		{
-			TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, scaleByHalf, rc);
-//		}
-//		else
-//		{
-//			PanicAlert("TODO: Implement EFB copying to RAM %s %d\n", __FILE__, __LINE__);
-//		}
+		TextureCache::CopyRenderTargetToTexture(address, fromZBuffer, isIntensityFmt, copyfmt, scaleByHalf, rc);		
 	}
 }
 
 void ClearScreen(const BPCmd &bp, const EFBRectangle &rc)
 {
+	// it seems that the GC is able to alpha blend on color-fill
+	// we cant do that so if alpha is != 255 we skip it
+
 	bool colorEnable = bpmem.blendmode.colorupdate;
 	bool alphaEnable = (bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24 && bpmem.blendmode.alphaupdate);
 	bool zEnable = bpmem.zmode.updateenable;

Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp

@@ -30,7 +30,7 @@ namespace D3D
 
 CD3DFont font;
 
-#define MAX_NUM_VERTICES 300
+#define MAX_NUM_VERTICES 50*6
 struct FONT2DVERTEX {
 	float x,y,z;
 	float col[4];
@@ -102,9 +102,10 @@ const char fontvertshader[] = {
 
 int CD3DFont::Init()
 {
+	// Create vertex buffer for the letters
 	HRESULT hr;
 
-	// prepare to create a bitmap
+	// Prepare to create a bitmap
 	unsigned int* pBitmapBits;
 	BITMAPINFO bmi;
 	ZeroMemory(&bmi.bmiHeader, sizeof(BITMAPINFOHEADER));
@@ -115,7 +116,7 @@ int CD3DFont::Init()
 	bmi.bmiHeader.biCompression = BI_RGB;
 	bmi.bmiHeader.biBitCount    = 32;
 
-	// create a DC and a bitmap for the font
+	// Create a DC and a bitmap for the font
 	HDC hDC = CreateCompatibleDC(NULL);
 	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (void**)&pBitmapBits, NULL, 0);
 	SetMapMode(hDC, MM_TEXT);
@@ -130,7 +131,7 @@ int CD3DFont::Init()
 	HGDIOBJ hOldbmBitmap = SelectObject(hDC, hbmBitmap);
 	HGDIOBJ hOldFont = SelectObject(hDC, hFont);
 
-	// set text properties
+	// Set text properties
 	SetTextColor(hDC, 0xFFFFFF);
 	SetBkColor  (hDC, 0);
 	SetTextAlign(hDC, TA_TOP);
@@ -139,8 +140,8 @@ int CD3DFont::Init()
 	GetTextMetricsW(hDC, &tm);
 	m_LineHeight = tm.tmHeight;
 
-	// loop through all printable characters and output them to the bitmap
-	// meanwhile, keep track of the corresponding tex coords for each character.
+	// Loop through all printable characters and output them to the bitmap
+	// Meanwhile, keep track of the corresponding tex coords for each character.
 	int x = 0, y = 0;
 	char str[2] = "\0";
 	for (int c = 0; c < 127 - 32; c++)
@@ -155,15 +156,15 @@ int CD3DFont::Init()
 		}
 
 		ExtTextOutA(hDC, x+1, y+0, ETO_OPAQUE | ETO_CLIPPED, NULL, str, 1, NULL);
-		m_fTexCoords[c][0] = (float) x         /m_dwTexWidth;
-		m_fTexCoords[c][1] = (float) y         /m_dwTexHeight;
-		m_fTexCoords[c][2] = (float)(x+size.cx)/m_dwTexWidth;
-		m_fTexCoords[c][3] = (float)(y+size.cy)/m_dwTexHeight;
+		m_fTexCoords[c][0] = ((float)(x+0))/m_dwTexWidth;
+		m_fTexCoords[c][1] = ((float)(y+0))/m_dwTexHeight;
+		m_fTexCoords[c][2] = ((float)(x+0+size.cx))/m_dwTexWidth;
+		m_fTexCoords[c][3] = ((float)(y+0+size.cy))/m_dwTexHeight;
 
 		x += size.cx + 3;  // 3 to work around annoying ij conflict (part of the j ends up with the i)
 	}
 
-	// create a new texture for the font
+	// Create a new texture for the font
 	// possible optimization: store the converted data in a buffer and fill the texture on creation.
 	//							That way, we can use a static texture
 	ID3D11Texture2D* buftex;
@@ -178,7 +179,7 @@ int CD3DFont::Init()
 	}
 	D3D::SetDebugObjectName((ID3D11DeviceChild*)buftex, "texture of a CD3DFont object");
 
-	// lock the surface and write the alpha values for the set pixels
+	// Lock the surface and write the alpha values for the set pixels
 	D3D11_MAPPED_SUBRESOURCE texmap;
 	hr = context->Map(buftex, 0, D3D11_MAP_WRITE_DISCARD, 0, &texmap);
 	if (FAILED(hr)) PanicAlert("Failed to map a texture at %s %d\n", __FILE__, __LINE__);
@@ -193,7 +194,7 @@ int CD3DFont::Init()
 		}
 	}
 
-	// clean up
+	// Done updating texture, so clean up used objects
 	context->Unmap(buftex, 0);
 	hr = D3D::device->CreateShaderResourceView(buftex, NULL, &m_pTexture);
 	if (FAILED(hr)) PanicAlert("Failed to create shader resource view at %s %d\n", __FILE__, __LINE__);
@@ -274,7 +275,8 @@ int CD3DFont::Shutdown()
 
 int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dwColor, const char* strText, bool center)
 {
-	if (!m_pVB) return 0;
+	if (!m_pVB)
+		return 0;
 
 	UINT stride = sizeof(FONT2DVERTEX);
 	UINT bufoffset = 0;
@@ -288,7 +290,7 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw
 	float sy = 1.f - y * scaley;
 	char c;
 
-	// fill vertex buffer
+	// Fill vertex buffer
 	FONT2DVERTEX* pVertices;
 	int dwNumTriangles = 0L;
 
@@ -336,7 +338,8 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw
 			sx  = fStartX;
 			sy -= scaley * size;
 		}
-		if (c < (' ')) continue;
+		if (c < (' '))
+			continue;
 
 		c -= 32;
 		float tx1 = m_fTexCoords[c][0];
@@ -348,10 +351,10 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw
 		float h = (float)(ty1-ty2) * m_dwTexHeight * scaley * sizeratio;
 
 		FONT2DVERTEX v[6];
-		v[0] = InitFont2DVertex(  sx, h+sy, dwColor, tx1, ty2);
-		v[1] = InitFont2DVertex(  sx,   sy, dwColor, tx1, ty1);
-		v[2] = InitFont2DVertex(w+sx, h+sy, dwColor, tx2, ty2);
-		v[3] = InitFont2DVertex(w+sx,   sy, dwColor, tx2, ty1);
+		v[0] = InitFont2DVertex(sx,   sy+h, dwColor, tx1, ty2);
+		v[1] = InitFont2DVertex(sx,   sy,   dwColor, tx1, ty1);
+		v[2] = InitFont2DVertex(sx+w, sy+h, dwColor, tx2, ty2);
+		v[3] = InitFont2DVertex(sx+w, sy,   dwColor, tx2, ty1);
 		v[4] = v[2];
 		v[5] = v[1];
 

Source/Plugins/Plugin_VideoDX11/Src/EmuWindow.cpp

@@ -164,7 +164,7 @@ void OSDMenu(WPARAM wParam)
 	case '7':
 		OSDChoice = 5;
 		g_Config.bDisableLighting = !g_Config.bDisableLighting;
-		break;		
+		break;
 	}
 }
 

Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp

@@ -19,12 +19,12 @@
 #include "D3DTexture.h"
 #include "D3DUtil.h"
 #include "Render.h"
-#include "FBManager.h"
+#include "FramebufferManager.h"
 #include "VideoConfig.h"
 #include "PixelShaderCache.h"
 #include "VertexShaderCache.h"
 
-FramebufferManager FBManager;
+FramebufferManager g_framebufferManager;
 
 D3DTexture2D* &FramebufferManager::GetEFBColorTexture() { return m_efb.color_tex; }
 ID3D11Texture2D* &FramebufferManager::GetEFBColorStagingBuffer() { return m_efb.color_staging_buf; }
@@ -120,19 +120,19 @@ FramebufferManager::VirtualXFBListType::iterator FramebufferManager::findVirtual
 			return it;
 	}
 
-	// that address is not in the Virtual XFB list.
+	// That address is not in the Virtual XFB list.
 	return m_virtualXFBList.end();
 }
 
 void FramebufferManager::replaceVirtualXFB()
 {
-	VirtualXFBListType::iterator it = m_virtualXFBList.begin();	
+	VirtualXFBListType::iterator it = m_virtualXFBList.begin();
 
 	s32 srcLower = it->xfbAddr;
 	s32 srcUpper = it->xfbAddr + 2 * it->xfbWidth * it->xfbHeight;
 	s32 lineSize = 2 * it->xfbWidth;
 
-	it++;
+	++it;
 
 	while (it != m_virtualXFBList.end())
 	{
@@ -141,13 +141,13 @@ void FramebufferManager::replaceVirtualXFB()
 
 		if (dstLower >= srcLower && dstUpper <= srcUpper)
 		{
-			// invalidate the data
+			// Invalidate the data
 			it->xfbAddr = 0;
 			it->xfbHeight = 0;
 			it->xfbWidth = 0;
 		}
 		else if (addrRangesOverlap(srcLower, srcUpper, dstLower, dstUpper))
-		{		
+		{
 			s32 upperOverlap = (srcUpper - dstLower) / lineSize;
 			s32 lowerOverlap = (dstUpper - srcLower) / lineSize;
 
@@ -162,7 +162,7 @@ void FramebufferManager::replaceVirtualXFB()
 			}
 		}
 
-		it++;
+		++it;
 	}
 }
 
@@ -195,15 +195,17 @@ void FramebufferManager::copyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight
 	targetSource.right = (int)(sourceRc.right * scaleX);
 	unsigned int target_width = targetSource.right - targetSource.left;
 	unsigned int target_height = targetSource.bottom - targetSource.top;
-	if (it != m_virtualXFBList.end())   // overwrite an existing Virtual XFB
+	if (it != m_virtualXFBList.end())
 	{
+		// Overwrite an existing Virtual XFB.
+
 		it->xfbAddr = xfbAddr;
 		it->xfbWidth = fbWidth;
 		it->xfbHeight = fbHeight;
 
 		it->xfbSource.srcAddr = xfbAddr;
 		it->xfbSource.srcWidth = fbWidth;
-		it->xfbSource.srcHeight = fbHeight;		
+		it->xfbSource.srcHeight = fbHeight;
 
 		if (it->xfbSource.texWidth != target_width || it->xfbSource.texHeight != target_height || !(it->xfbSource.tex))
 		{
@@ -222,8 +224,9 @@ void FramebufferManager::copyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight
 		// keep stale XFB data from being used
 		replaceVirtualXFB();
 	}
-	else   // create a new Virtual XFB and place it at the front of the list
+	else
 	{
+		// Create a new Virtual XFB and place it at the front of the list.
 		VirtualXFB newVirt;
 
 		newVirt.xfbSource.tex = D3DTexture2D::Create(target_width, target_height, (D3D11_BIND_FLAG)(D3D11_BIND_RENDER_TARGET|D3D11_BIND_SHADER_RESOURCE), D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8G8B8A8_UNORM);
@@ -253,7 +256,7 @@ void FramebufferManager::copyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight
     
 	Renderer::ResetAPIState(); // reset any game specific settings
 
-	// copy EFB data to XFB and restore render target again
+	// Copy EFB data to XFB and restore render target again
 	D3D11_RECT sourcerect = CD3D11_RECT(efbSource.left, efbSource.top, efbSource.right, efbSource.bottom);
 	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)target_width, (float)target_height);
 	D3D::context->RSSetViewports(1, &vp);
@@ -277,8 +280,11 @@ const XFBSource** FramebufferManager::getVirtualXFBSource(u32 xfbAddr, u32 fbWid
 {
 	xfbCount = 0;
 
-	if (m_virtualXFBList.size() == 0)  // no Virtual XFBs available
+	if (m_virtualXFBList.size() == 0)
+	{
+		// No Virtual XFBs available.
 		return NULL;
+	}
 
 	u32 srcLower = xfbAddr;
 	u32 srcUpper = xfbAddr + 2 * fbWidth * fbHeight;
@@ -297,5 +303,6 @@ const XFBSource** FramebufferManager::getVirtualXFBSource(u32 xfbAddr, u32 fbWid
 			xfbCount++;
 		}
 	}
+
 	return &m_overlappingXFBArray[0];
 }

Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h

@@ -130,8 +130,8 @@ private:
 	const XFBSource** getRealXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount);
 	const XFBSource** getVirtualXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount);
 
-	XFBSource m_realXFBSource;           // used in real XFB mode
-	VirtualXFBListType m_virtualXFBList; // used in virtual XFB mode
+	XFBSource m_realXFBSource; // Only used in Real XFB mode
+	VirtualXFBListType m_virtualXFBList; // Only used in Virtual XFB mode
 
 	const XFBSource* m_overlappingXFBArray[MAX_VIRTUAL_XFB];
 
@@ -146,6 +146,6 @@ private:
 	} m_efb;
 };
 
-extern FramebufferManager FBManager;
+extern FramebufferManager g_framebufferManager;
 
 #endif

Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp

@@ -23,7 +23,6 @@
 #include "ABI.h"
 #include "MemoryUtil.h"
 #include "VertexShaderGen.h"
-#include "VertexShaderCache.h"
 
 #include "CPMemory.h"
 #include "NativeVertexFormat.h"
@@ -66,11 +65,11 @@ DXGI_FORMAT VarToD3D(VarType t, int size)
 
 	switch (size)
 	{
-		case 1: retval = lookup1[t]; break;
-		case 2: retval = lookup2[t]; break;
-		case 3: retval = lookup3[t]; break;
-		case 4: retval = lookup4[t]; break;
-		default: break;
+	case 1: retval = lookup1[t]; break;
+	case 2: retval = lookup2[t]; break;
+	case 3: retval = lookup3[t]; break;
+	case 4: retval = lookup4[t]; break;
+	default: break;
 	}
 	if (retval == DXGI_FORMAT_UNKNOWN)
 	{

Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp

@@ -199,6 +199,9 @@ void PixelShaderCache::Init()
 	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
 		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
 
+	SETSTAT(stats.numPixelShadersCreated, 0);
+	SETSTAT(stats.numPixelShadersAlive, 0);
+
 	char cache_filename[MAX_PATH];
 	sprintf(cache_filename, "%sdx11-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX), globals->unique_id);
 	PixelShaderCacheInserter inserter;
@@ -230,7 +233,7 @@ bool PixelShaderCache::SetShader(bool dstAlpha,u32 components)
 	PIXELSHADERUID uid;
 	GetPixelShaderId(&uid, dstAlpha);
 
-	// check if the shader is already set
+	// Check if the shader is already set
 	if (uid == last_pixel_shader_uid && PixelShaders[uid].frameCount == frameCount)
 	{
 		PSCache::const_iterator iter = PixelShaders.find(uid);
@@ -239,7 +242,7 @@ bool PixelShaderCache::SetShader(bool dstAlpha,u32 components)
 
 	memcpy(&last_pixel_shader_uid, &uid, sizeof(PIXELSHADERUID));
 
-	// check if the shader is already in the cache
+	// Check if the shader is already in the cache
 	PSCache::iterator iter;
 	iter = PixelShaders.find(uid);
 	if (iter != PixelShaders.end())
@@ -252,7 +255,7 @@ bool PixelShaderCache::SetShader(bool dstAlpha,u32 components)
 		return (entry.shader != NULL);
 	}
 
-	// need to compile a new shader
+	// Need to compile a new shader
 	const char* code = GeneratePixelShaderCode(dstAlpha, API_D3D11,components);
 
 	D3DBlob* pbytecode;
@@ -262,7 +265,7 @@ bool PixelShaderCache::SetShader(bool dstAlpha,u32 components)
 		return false;
 	}
 
-	// insert the bytecode into the caches
+	// Insert the bytecode into the caches
 	g_ps_disk_cache.Append((u8*)&uid, sizeof(uid), (const u8*)pbytecode->Data(), pbytecode->Size());
 	g_ps_disk_cache.Sync();
 
@@ -283,15 +286,19 @@ bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, void* bytecode,
 	// TODO: Somehow make the debug name a bit more specific
 	D3D::SetDebugObjectName((ID3D11DeviceChild*)shader, "a pixel shader of PixelShaderCache");
 
-	// make an entry in the table
+	// Make an entry in the table
 	PSCacheEntry newentry;
 	newentry.shader = shader;
 	newentry.frameCount = frameCount;
 	PixelShaders[uid] = newentry;
 	last_entry = &PixelShaders[uid];
 
+	if (!shader) {
+		// INCSTAT(stats.numPixelShadersFailed);
+		return false;
+	}
+
 	INCSTAT(stats.numPixelShadersCreated);
 	SETSTAT(stats.numPixelShadersAlive, PixelShaders.size());
-
 	return true;
 }

Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp

@@ -28,7 +28,7 @@
 #include "D3DBase.h"
 #include "D3DTexture.h"
 #include "D3DUtil.h"
-#include "FBManager.h"
+#include "FramebufferManager.h"
 #include "PixelShaderCache.h"
 #include "PixelShaderManager.h"
 #include "VertexShaderManager.h"
@@ -59,7 +59,7 @@ void TextureCache::TCacheEntry::Destroy(bool shutdown)
 
 	if (!isRenderTarget && !shutdown && !g_ActiveConfig.bSafeTextureCache)
 	{
-		u32* ptr = (u32*)g_VideoInitialize.pGetMemoryPointer(addr);
+		u32 *ptr = (u32*)g_VideoInitialize.pGetMemoryPointer(addr);
 		if (ptr && *ptr == hash)
 			*ptr = oldpixel;
 	}
@@ -123,30 +123,6 @@ void TextureCache::Invalidate(bool shutdown)
 	HiresTextures::Shutdown();
 }
 
-void TextureCache::InvalidateRange(u32 start_address, u32 size)
-{
-	TexCache::iterator iter = textures.begin();
-	while (iter != textures.end())
-	{
-		if (iter->second.IntersectsMemoryRange(start_address, size))
-		{
-			iter->second.Destroy(false);
-			textures.erase(iter++);
-		}
-		else
-		{
-			++iter;
-		}
-	}
-}
-
-bool TextureCache::TCacheEntry::IntersectsMemoryRange(u32 range_address, u32 range_size)
-{
-	if (addr + size_in_bytes < range_address) return false;
-	if (addr >= range_address + range_size) return false;
-	return true;
-}
-
 void TextureCache::Shutdown()
 {
 	Invalidate(true);
@@ -178,6 +154,31 @@ void TextureCache::Cleanup()
 	}
 }
 
+void TextureCache::InvalidateRange(u32 start_address, u32 size)
+{
+	TexCache::iterator iter = textures.begin();
+	while (iter != textures.end())
+	{
+		if (iter->second.IntersectsMemoryRange(start_address, size))
+		{
+			iter->second.Destroy(false);
+			textures.erase(iter++);
+		}
+		else
+		{
+			++iter;
+		}
+	}
+}
+
+bool TextureCache::TCacheEntry::IntersectsMemoryRange(u32 range_address, u32 range_size)
+{
+	if (addr + size_in_bytes < range_address) return false;
+	if (addr >= range_address + range_size) return false;
+	return true;
+}
+
+
 // returns the exponent of the smallest power of two which is greater than val
 unsigned int GetPow2(unsigned int val)
 {
@@ -188,21 +189,47 @@ unsigned int GetPow2(unsigned int val)
 
 TextureCache::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)
 {
-	if (address == 0) return NULL;
+	// notes (about "UNsafe texture cache"):
+	//	Have to be removed soon.
+	//	But we keep it until the "safe" way became rock solid
+	//	pros: it has an unique ID held by the texture data itself (@address) once cached.
+	//	cons: it writes this unique ID in the gc RAM <- very dangerous (break MP1) and ugly 
 
-	u8* ptr = g_VideoInitialize.pGetMemoryPointer(address);
+	// notes (about "safe texture cache"):
+	//	Metroids text issue (character table):
+	//	Same addr, same GX_TF_C4 texture data but different TLUT (hence different outputs).
+	//	That's why we have to hash the TLUT too for TLUT tex_format dependent textures (ie. GX_TF_C4, GX_TF_C8, GX_TF_C14X2).
+	//	And since the address and tex data don't change, the key index in the cacheEntry map can't be the address but 
+	//	have to be a real unique ID. 
+	//	DONE but not satifiying yet -> may break copyEFBToTexture sometimes.
+
+	//	Pokemon Colosseum text issue (plain text):
+	//	Use a GX_TF_I4 512x512 text-flush-texture at a const address.
+	//	The problem here was just the sparse hash on the texture. This texture is partly overwrited (what is needed only) 
+	//	so lot's of remaning old text. 	Thin white chars on black bg too.
+
+	// TODO:	- clean this up when ready to kill old "unsafe texture cache"
+	//			- fix the key index situation with CopyRenderTargetToTexture. 
+	//			Could happen only for GX_TF_C4, GX_TF_C8 and GX_TF_C14X2 fmt.
+	//			Wonder if we can't use tex width&height to know if EFB might be copied to it...
+	//			raw idea:  TOCHECK if addresses are aligned we have few bits left...
+
+	if (address == 0)
+		return NULL;
+
+	u8 *ptr = g_VideoInitialize.pGetMemoryPointer(address);
 	unsigned int bsw = TexDecoder_GetBlockWidthInTexels(tex_format) - 1; // TexelSizeInNibbles(format)*width*height/16;
 	unsigned int bsh = TexDecoder_GetBlockHeightInTexels(tex_format) - 1; // TexelSizeInNibbles(format)*width*height/16;
 	unsigned int bsdepth = TexDecoder_GetTexelSizeInNibbles(tex_format);
-	unsigned int expandedWidth  = (width  + bsw) & (~bsw);
+	unsigned int expandedWidth = (width + bsw) & (~bsw);
 	unsigned int expandedHeight = (height + bsh) & (~bsh);
 
-	u64 hash_value;
+	u64 hash_value = 0;
 	u32 texID = address;
-	u64 texHash;
+	u64 texHash = 0;
 	u32 FullFormat = tex_format;
 	if ((tex_format == GX_TF_C4) || (tex_format == GX_TF_C8) || (tex_format == GX_TF_C14X2))
-		u32 FullFormat = (tex_format | (tlutfmt << 16));
+		FullFormat = (tex_format | (tlutfmt << 16));
 
 	// hires textures and texture dumping not supported, yet
 	if (g_ActiveConfig.bSafeTextureCache/* || g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures*/)
@@ -264,7 +291,7 @@ TextureCache::TCacheEntry* TextureCache::Load(unsigned int stage, u32 address, u
 		}
 	}
 
-	// make an entry in the table
+	// Make an entry in the table
 	TCacheEntry& entry = textures[texID];
 	PC_TexFormat pcfmt = PC_TEX_FMT_NONE;
 
@@ -306,6 +333,7 @@ TextureCache::TCacheEntry* TextureCache::Load(unsigned int stage, u32 address, u
 	{
 		D3D::ReplaceRGBATexture2D(entry.texture->GetTex(), temp, width, height, expandedWidth, 0, usage);
 	}
+
 	entry.addr = address;
 	entry.size_in_bytes = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, tex_format);
 	entry.isRenderTarget = false;
@@ -340,7 +368,7 @@ TextureCache::TCacheEntry* TextureCache::Load(unsigned int stage, u32 address, u
 	entry.fmt = FullFormat;
 
 	INCSTAT(stats.numTexturesCreated);
-	SETSTAT(stats.numTexturesAlive, (int)textures.size());
+	SETSTAT(stats.numTexturesAlive, textures.size());
 
 	D3D::gfxstate->SetShaderResource(stage, entry.texture->GetSRV());
 
@@ -370,7 +398,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, boo
 		}
 		else
 		{
-			// remove it and recreate it as a render target
+			// Remove it and recreate it as a render target
 			SAFE_RELEASE(iter->second.texture);
 			textures.erase(iter);
 		}
@@ -557,13 +585,13 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, boo
 	D3D::stateman->PushDepthState(efbcopydepthstate);
 	D3D::context->OMSetRenderTargets(1, &tex->GetRTV(), NULL);
 	D3D::drawShadedTexQuad(
-				(bFromZBuffer) ? FBManager.GetEFBDepthTexture()->GetSRV() : FBManager.GetEFBColorTexture()->GetSRV(),
+				(bFromZBuffer) ? g_framebufferManager.GetEFBDepthTexture()->GetSRV() : g_framebufferManager.GetEFBColorTexture()->GetSRV(),
 				&sourcerect,
 				Renderer::GetFullTargetWidth(),
 				Renderer::GetFullTargetHeight(),
 				(bFromZBuffer) ? PixelShaderCache::GetDepthMatrixProgram() : PixelShaderCache::GetColorMatrixProgram(), VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout());
 
-	D3D::context->OMSetRenderTargets(1, &FBManager.GetEFBColorTexture()->GetRTV(), FBManager.GetEFBDepthTexture()->GetDSV());
+	D3D::context->OMSetRenderTargets(1, &g_framebufferManager.GetEFBColorTexture()->GetRTV(), g_framebufferManager.GetEFBDepthTexture()->GetDSV());
 	D3D::stateman->PopBlendState();
 	D3D::stateman->PopDepthState();
 	D3D::stateman->PopRasterizerState();

Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp

@@ -24,7 +24,7 @@
 #include "Fifo.h"
 #include "Statistics.h"
 #include "Profiler.h"
-#include "FBManager.h"
+#include "FramebufferManager.h"
 #include "VertexManager.h"
 #include "OpcodeDecoding.h"
 #include "IndexGenerator.h"
@@ -47,11 +47,18 @@ using std::string;
 
 using namespace D3D;
 
-extern NativeVertexFormat* g_nativeVertexFmt;
+// internal state for loading vertices
+extern NativeVertexFormat *g_nativeVertexFmt;
 
 namespace VertexManager
 {
 
+static int lastPrimitive;
+
+static u8 *LocalVBuffer;
+static u16 *TIBuffer;
+static u16 *LIBuffer;
+static u16 *PIBuffer;
 #define MAXVBUFFERSIZE 0x50000
 #define MAXIBUFFERSIZE 0x10000
 
@@ -59,12 +66,6 @@ namespace VertexManager
 #define NUM_VERTEXBUFFERS 8
 #define NUM_INDEXBUFFERS 10
 
-int lastPrimitive;
-
-u8* LocalVBuffer = NULL;
-u16* TIBuffer = NULL;
-u16* LIBuffer = NULL;
-u16* PIBuffer = NULL;
 bool Flushed=false;
 
 ID3D11Buffer* indexbuffers[NUM_INDEXBUFFERS] = {NULL};
@@ -147,17 +148,17 @@ void Shutdown()
 	ResetBuffer();
 }
 
-void AddIndices(int _primitive, int _numVertices)
+void AddIndices(int primitive, int numVertices)
 {
-	switch (_primitive)
+	switch (primitive)
 	{
-		case GX_DRAW_QUADS:          IndexGenerator::AddQuads(_numVertices);     break;
-		case GX_DRAW_TRIANGLES:      IndexGenerator::AddList(_numVertices);      break;
-		case GX_DRAW_TRIANGLE_STRIP: IndexGenerator::AddStrip(_numVertices);     break;
-		case GX_DRAW_TRIANGLE_FAN:   IndexGenerator::AddFan(_numVertices);       break;
-		case GX_DRAW_LINE_STRIP:     IndexGenerator::AddLineStrip(_numVertices); break;
-		case GX_DRAW_LINES:          IndexGenerator::AddLineList(_numVertices);  break;
-		case GX_DRAW_POINTS:         IndexGenerator::AddPoints(_numVertices);    break;
+	case GX_DRAW_QUADS:          IndexGenerator::AddQuads(numVertices); break;
+	case GX_DRAW_TRIANGLES:      IndexGenerator::AddList(numVertices); break;
+	case GX_DRAW_TRIANGLE_STRIP: IndexGenerator::AddStrip(numVertices);     break;
+	case GX_DRAW_TRIANGLE_FAN:   IndexGenerator::AddFan(numVertices);       break;
+	case GX_DRAW_LINE_STRIP:     IndexGenerator::AddLineStrip(numVertices); break;
+	case GX_DRAW_LINES:          IndexGenerator::AddLineList(numVertices); break;
+	case GX_DRAW_POINTS:         IndexGenerator::AddPoints(numVertices);    break;
 	}
 }
 
@@ -170,53 +171,54 @@ int GetRemainingVertices(int primitive)
 {
 	switch (primitive)
 	{
-		case GX_DRAW_QUADS:
-		case GX_DRAW_TRIANGLES:
-		case GX_DRAW_TRIANGLE_STRIP:
-		case GX_DRAW_TRIANGLE_FAN:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen())/3;
-		case GX_DRAW_LINE_STRIP:
-		case GX_DRAW_LINES:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen())/2;
-		case GX_DRAW_POINTS:
-			return (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen());
-		default: return 0;
+	case GX_DRAW_QUADS:
+	case GX_DRAW_TRIANGLES:
+	case GX_DRAW_TRIANGLE_STRIP:
+	case GX_DRAW_TRIANGLE_FAN:
+		return (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen())/3;
+	case GX_DRAW_LINE_STRIP:
+	case GX_DRAW_LINES:
+		return (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen())/2;
+	case GX_DRAW_POINTS:
+		return (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen());
+	default: return 0;
 	}
 }
 
-void AddVertices(int _primitive, int _numVertices)
+void AddVertices(int primitive, int numVertices)
 {
-	if (_numVertices <= 0) return;
+	if (numVertices <= 0)
+		return;
 
-	switch (_primitive)
+	switch (primitive)
 	{
-		case GX_DRAW_QUADS:
-		case GX_DRAW_TRIANGLES:
-		case GX_DRAW_TRIANGLE_STRIP:
-		case GX_DRAW_TRIANGLE_FAN:
-			if (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen() < 3 * _numVertices)
+	case GX_DRAW_QUADS:
+	case GX_DRAW_TRIANGLES:
+	case GX_DRAW_TRIANGLE_STRIP:
+	case GX_DRAW_TRIANGLE_FAN:
+		if (MAXIBUFFERSIZE - IndexGenerator::GetTriangleindexLen() < 3 * numVertices)
 			Flush();
-			break;
-		case GX_DRAW_LINE_STRIP:
-		case GX_DRAW_LINES:
-			if (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen() < 2 * _numVertices)
+		break;
+	case GX_DRAW_LINE_STRIP:
+	case GX_DRAW_LINES:
+		if (MAXIBUFFERSIZE - IndexGenerator::GetLineindexLen() < 2 * numVertices)
 			Flush();
-			break;
-		case GX_DRAW_POINTS:
-			if (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen() < _numVertices)
+		break;
+	case GX_DRAW_POINTS:
+		if (MAXIBUFFERSIZE - IndexGenerator::GetPointindexLen() < numVertices)
 			Flush();
-			break;
-		default: return;
+		break;
+	default: return;
 	}
 	if (Flushed)
 	{
 		IndexGenerator::Start(TIBuffer,LIBuffer,PIBuffer);
 		Flushed=false;
 	}
-	lastPrimitive = _primitive;
-	ADDSTAT(stats.thisFrame.numPrims, _numVertices);
+	lastPrimitive = primitive;
+	ADDSTAT(stats.thisFrame.numPrims, numVertices);
 	INCSTAT(stats.thisFrame.numPrimitiveJoins);
-	AddIndices(_primitive, _numVertices);
+	AddIndices(primitive, numVertices);
 }
 
 inline void Draw(u32 stride, bool alphapass)
@@ -303,10 +305,8 @@ void Flush()
 
 	u32 usedtextures = 0;
 	for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
-	{
-		if (bpmem.tevorders[i/2].getEnable(i & 1))
+		if (bpmem.tevorders[i / 2].getEnable(i & 1))
 			usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
-	}
 
 	if (bpmem.genMode.numindstages > 0)
 		for (unsigned int i = 0; i < bpmem.genMode.numtevstages + 1; ++i)
@@ -320,24 +320,24 @@ void Flush()
 			Renderer::SetSamplerState(i & 3, i >> 2);
 			FourTexUnits &tex = bpmem.tex[i >> 2];
 			TextureCache::TCacheEntry* 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));
+				(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->w, tentry->h, 0, 0);
 			}
 			else
-			{
 				ERROR_LOG(VIDEO, "error loading texture");
-			}
 		}
 	}
 
+	// set global constants
 	VertexShaderManager::SetConstants();
 	PixelShaderManager::SetConstants();
 
@@ -365,5 +365,4 @@ void Flush()
 shader_fail:
 	ResetBuffer();
 }
-
 }  // namespace

Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp

@@ -33,7 +33,7 @@
 #include "XFMemory.h"
 
 VertexShaderCache::VSCache VertexShaderCache::vshaders;
-const VertexShaderCache::VSCacheEntry* VertexShaderCache::last_entry;
+const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
 
 static ID3D11VertexShader* SimpleVertexShader = NULL;
 static ID3D11VertexShader* ClearVertexShader = NULL;
@@ -83,7 +83,7 @@ void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const
 // this class will load the precompiled shaders into our cache
 class VertexShaderCacheInserter : public LinearDiskCacheReader {
 public:
-	void Read(const u8* key, int key_size, const u8* value, int value_size)
+	void Read(const u8 *key, int key_size, const u8 *value, int value_size)
 	{
 		VERTEXSHADERUID uid;
 		if (key_size != sizeof(uid))
@@ -177,6 +177,9 @@ void VertexShaderCache::Init()
 	if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
 		File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
 
+	SETSTAT(stats.numVertexShadersCreated, 0);
+	SETSTAT(stats.numVertexShadersAlive, 0);
+
 	char cache_filename[MAX_PATH];
 	sprintf(cache_filename, "%sdx11-%s-vs.cache", File::GetUserPath(D_SHADERCACHE_IDX), globals->unique_id);
 	VertexShaderCacheInserter inserter;
@@ -214,8 +217,7 @@ bool VertexShaderCache::SetShader(u32 components)
 
 	memcpy(&last_vertex_shader_uid, &uid, sizeof(VERTEXSHADERUID));
 
-	VSCache::iterator iter;
-	iter = vshaders.find(uid);
+	VSCache::iterator iter = vshaders.find(uid);
 	if (iter != vshaders.end())
 	{
 		iter->second.frameCount = frameCount;
@@ -226,7 +228,7 @@ bool VertexShaderCache::SetShader(u32 components)
 		return (entry.shader != NULL);
 	}
 
-	const char* code = GenerateVertexShaderCode(components, API_D3D11);
+	const char *code = GenerateVertexShaderCode(components, API_D3D11);
 
 	D3DBlob* pbytecode = NULL;
 	D3D::CompileVertexShader(code, (int)strlen(code), &pbytecode);

Source/Plugins/Plugin_VideoDX11/Src/main.cpp

@@ -52,19 +52,9 @@
 #include "D3DUtil.h"
 #include "W32Util/Misc.h"
 #include "EmuWindow.h"
-#include "FBManager.h"
+#include "FramebufferManager.h"
 #include "DLCache.h"
 
-
-#if defined(DEBUGFAST)
-#define DLL_PLUGIN_NAME "Dolphin Direct3D 11 (DebugFast)"
-#elif defined(_DEBUG)
-#define DLL_PLUGIN_NAME "Dolphin Direct3D 11 (Debug)"
-#else
-#define DLL_PLUGIN_NAME "Dolphin Direct3D 11"
-#endif
-
-
 HINSTANCE g_hInstance = NULL;
 SVideoInitialize g_VideoInitialize;
 PLUGIN_GLOBALS* globals = NULL;
@@ -148,7 +138,7 @@ unsigned int Callback_PeekMessages()
 }
 
 
-void UpdateFPSDisplay(const char* text)
+void UpdateFPSDisplay(const char *text)
 {
 	char temp[512];
 	sprintf_s(temp, 512, "SVN R%s: DX11: %s", svn_rev_str, text);
@@ -159,7 +149,13 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 {
 	_PluginInfo->Version = 0x0100;
 	_PluginInfo->Type = PLUGIN_TYPE_VIDEO;
-	sprintf_s(_PluginInfo->Name, 100, DLL_PLUGIN_NAME);
+#ifdef DEBUGFAST
+	sprintf_s(_PluginInfo->Name, 100, "Dolphin Direct3D11 (DebugFast)");
+#elif defined _DEBUG
+	sprintf_s(_PluginInfo->Name, 100, "Dolphin Direct3D11 (Debug)");
+#else
+	sprintf_s(_PluginInfo->Name, 100, "Dolphin Direct3D11");
+#endif
 }
 
 void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals)
@@ -170,7 +166,7 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals)
 
 void DllAbout(HWND _hParent)
 {
-	MessageBoxA(NULL, "DllAbout not implemented, how did you come here? Anyway, report this to the devs.", "Error!", MB_OK);
+	//DialogBox(g_hInstance,(LPCTSTR)IDD_ABOUT,_hParent,(DLGPROC)AboutProc);
 }
 
 void DllConfig(void *_hParent)
@@ -178,11 +174,12 @@ void DllConfig(void *_hParent)
 	DlgSettings_Show(g_hInstance, (HWND)((wxWindow *)_hParent)->GetHandle());
 }
 
-void Initialize(void* init)
+void Initialize(void *init)
 {
 	frameCount = 0;
-	SVideoInitialize* _pVideoInitialize = (SVideoInitialize*)init;
-	g_VideoInitialize = *_pVideoInitialize;
+	SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init;
+	// Create a shortcut to _pVideoInitialize that can also update it
+	g_VideoInitialize = *(_pVideoInitialize);
 	InitXFBConvTables();
 
 	g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_dx11.ini").c_str());
@@ -201,14 +198,17 @@ void Initialize(void* init)
 
 	_pVideoInitialize->pPeekMessages = g_VideoInitialize.pPeekMessages;
 	_pVideoInitialize->pUpdateFPSDisplay = g_VideoInitialize.pUpdateFPSDisplay;
+
+	// Now the window handle is written
 	_pVideoInitialize->pWindowHandle = g_VideoInitialize.pWindowHandle;
 
-	OSD::AddMessage("Dolphin Direct3D 11 Video Plugin.", 5000);
+	OSD::AddMessage("Dolphin Direct3D11 Video Plugin.", 5000);
 	s_PluginInitialized = true;
 }
 
 void Video_Prepare()
 {
+	// Better be safe...
 	s_efbAccessRequested = FALSE;
 	s_FifoShuttingDown = FALSE;
 	s_swapRequested = FALSE;
@@ -232,24 +232,26 @@ void Video_Prepare()
 	PixelEngine::Init();
 	DLCache::Init();
 
-	// tell the host that the window is ready
+	// Tell the host that the window is ready
 	g_VideoInitialize.pCoreMessage(WM_USER_CREATE);
 }
 
 void Shutdown()
 {
+	s_PluginInitialized = false;
+
 	s_efbAccessRequested = FALSE;
 	s_FifoShuttingDown = FALSE;
 	s_swapRequested = FALSE;
 
 	// VideoCommon
 	DLCache::Shutdown();
+	Fifo_Shutdown();
 	CommandProcessor::Shutdown();
 	PixelShaderManager::Shutdown();
 	VertexShaderManager::Shutdown();
 	OpcodeDecoder_Shutdown();
 	VertexLoaderManager::Shutdown();
-	Fifo_Shutdown();
 
 	// internal interfaces
 	D3D::ShutdownUtils();
@@ -263,13 +265,13 @@ void Shutdown()
 	s_PluginInitialized = false;
 }
 
-void DoState(unsigned char** ptr, int mode)
+void DoState(unsigned char **ptr, int mode)
 {
-	// clear texture cache because it might have written to RAM
+	// Clear texture cache because it might have written to RAM
 	CommandProcessor::FifoCriticalEnter();
 	TextureCache::Invalidate(false);
 	CommandProcessor::FifoCriticalLeave();
-	// no need to clear shader caches
+	// No need to clear shader caches
 	PointerWrap p(ptr, mode);
 	VideoCommon_DoState(p);
 }
@@ -279,6 +281,7 @@ void EmuStateChange(PLUGIN_EMUSTATE newState)
 	Fifo_RunLoop((newState == PLUGIN_EMUSTATE_PLAY) ? true : false);
 }
 
+// Enter and exit the video loop
 void Video_EnterLoop()
 {
 	Fifo_EnterLoop(g_VideoInitialize);
@@ -349,6 +352,7 @@ void Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
 	}
 }
 
+// Run from the CPU thread (from VideoInterface.cpp)
 void Video_EndField()
 {
 }
@@ -358,7 +362,8 @@ void Video_AddMessage(const char* pstr, u32 milliseconds)
 	OSD::AddMessage(pstr, milliseconds);
 }
 
-void Video_Screenshot(const char* _szFilename)
+// Screenshot
+void Video_Screenshot(const char *_szFilename)
 {
 	Renderer::SetScreenshot(_szFilename);
 }
@@ -391,6 +396,7 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
 		s_accessEFBArgs.x = x;
 		s_accessEFBArgs.y = y;
 		s_accessEFBArgs.Data = InputData;
+
 		Common::AtomicStoreRelease(s_efbAccessRequested, TRUE);
 
 		if (g_VideoInitialize.bOnThread)
@@ -404,6 +410,7 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
 
 		return s_AccessEFBResult;
 	}
+
 	return 0;
 }
 

Source/Plugins/Plugin_VideoDX9/Src/BPFunctions.cpp

@@ -16,24 +16,26 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "BPFunctions.h"
-#include "D3DBase.h"
-#include "VideoConfig.h"
 #include "Common.h"
+#include "D3DBase.h"
+#include "Debugger/Debugger.h"
 #include "TextureCache.h"
 #include "VertexManager.h"
 #include "VertexShaderManager.h"
-#include "Debugger/Debugger.h"
-#include "TextureConverter.h"
-
+#include "VideoConfig.h"
 
 bool textureChanged[8];
-
 const bool renderFog = false;
 
 using namespace D3D;
 
 namespace BPFunctions
 {
+// ----------------------------------------------
+// State translation lookup tables
+// Reference: Yet Another Gamecube Documentation
+// ----------------------------------------------
+
 
 void FlushPipeline()
 {
@@ -80,9 +82,10 @@ void SetColorMask(const BPCmd &bp)
 
 void CopyEFB(const BPCmd &bp, const EFBRectangle &rc, const u32 &address, const bool &fromZBuffer, const bool &isIntensityFmt, const u32 &copyfmt, const int &scaleByHalf)
 {
+	// 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/D3DShader.cpp

@@ -24,22 +24,24 @@
 namespace D3D
 {
 
-// Bytecode->shader.
+// bytecode->shader.
 LPDIRECT3DVERTEXSHADER9 CreateVertexShaderFromByteCode(const u8 *bytecode, int len)
 {
 	LPDIRECT3DVERTEXSHADER9 v_shader;
 	HRESULT hr = D3D::dev->CreateVertexShader((DWORD *)bytecode, &v_shader);
 	if (FAILED(hr))
-		v_shader = 0;
+	{
+		PanicAlert("CreateVertexShaderFromByteCode failed from %p (size %d) at %s %d\n", bytecode, len, __FILE__, __LINE__);
+		v_shader = NULL;
+	}
 	return v_shader;
 }
 
-// Code->bytecode.
+// code->bytecode.
 bool CompileVertexShader(const char *code, int len, u8 **bytecode, int *bytecodelen)
 {
-	//try to compile
-	LPD3DXBUFFER shaderBuffer = 0;
-	LPD3DXBUFFER errorBuffer = 0;
+	LPD3DXBUFFER shaderBuffer = NULL;
+	LPD3DXBUFFER errorBuffer = NULL;
  	HRESULT hr = PD3DXCompileShader(code, len, 0, 0, "main", D3D::VertexShaderVersionString(),
 						           0, &shaderBuffer, &errorBuffer, 0);
 	if (FAILED(hr))
@@ -69,18 +71,20 @@ bool CompileVertexShader(const char *code, int len, u8 **bytecode, int *bytecode
 	return SUCCEEDED(hr) ? true : false;
 }
 
-
-// Bytecode->shader.
+// bytecode->shader
 LPDIRECT3DPIXELSHADER9 CreatePixelShaderFromByteCode(const u8 *bytecode, int len)
 {
 	LPDIRECT3DPIXELSHADER9 p_shader;
 	HRESULT hr = D3D::dev->CreatePixelShader((DWORD *)bytecode, &p_shader);
 	if (FAILED(hr))
-		p_shader = 0;
+	{
+		PanicAlert("CreatePixelShaderFromByteCode failed at %s %d\n", __FILE__, __LINE__);
+		p_shader = NULL;
+	}
 	return p_shader;
 }
 
-
+// code->bytecode
 bool CompilePixelShader(const char *code, int len, u8 **bytecode, int *bytecodelen)
 {
 	LPD3DXBUFFER shaderBuffer = 0;
@@ -118,28 +122,32 @@ bool CompilePixelShader(const char *code, int len, u8 **bytecode, int *bytecodel
 	return SUCCEEDED(hr) ? true : false;
 }
 
-LPDIRECT3DVERTEXSHADER9 CompileAndCreateVertexShader(const char *code, int len) {
+LPDIRECT3DVERTEXSHADER9 CompileAndCreateVertexShader(const char *code, int len)
+{
 	u8 *bytecode;
 	int bytecodelen;
-	if (CompileVertexShader(code, len, &bytecode, &bytecodelen)) {
+	if (CompileVertexShader(code, len, &bytecode, &bytecodelen))
+	{
 		LPDIRECT3DVERTEXSHADER9 v_shader = CreateVertexShaderFromByteCode(bytecode, len);
 		delete [] bytecode;
 		return v_shader;
-	} else {
-		return 0;
 	}
+	PanicAlert("Failed to compile and create vertex shader from %p (size %d) at %s %d\n", code, len, __FILE__, __LINE__);
+	return NULL;
 }
 
-LPDIRECT3DPIXELSHADER9 CompileAndCreatePixelShader(const char *code, int len) {
+LPDIRECT3DPIXELSHADER9 CompileAndCreatePixelShader(const char* code, unsigned int len)
+{
 	u8 *bytecode;
 	int bytecodelen;
-	if (CompilePixelShader(code, len, &bytecode, &bytecodelen)) {
+	if (CompilePixelShader(code, len, &bytecode, &bytecodelen))
+	{
 		LPDIRECT3DPIXELSHADER9 p_shader = CreatePixelShaderFromByteCode(bytecode, len);
 		delete [] bytecode;
 		return p_shader;
-	} else {
-		return 0;
 	}
+	PanicAlert("Failed to compile and create pixel shader, %s %d\n", __FILE__, __LINE__);
+	return NULL;
 }
 
 }  // namespace

Source/Plugins/Plugin_VideoDX9/Src/D3DShader.h

@@ -30,5 +30,5 @@ namespace D3D
 
 	// Utility functions
 	LPDIRECT3DVERTEXSHADER9 CompileAndCreateVertexShader(const char *code, int len);
-	LPDIRECT3DPIXELSHADER9 CompileAndCreatePixelShader(const char *code, int len);
+	LPDIRECT3DPIXELSHADER9 CompileAndCreatePixelShader(const char *code, unsigned int len);
 }

Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp

@@ -63,9 +63,9 @@ int CD3DFont::Init()
 	m_fTextScale  = 1.0f; // Draw fonts into texture without scaling
 
 	// Prepare to create a bitmap
-	int *pBitmapBits;
+	unsigned int* pBitmapBits;
 	BITMAPINFO bmi;
-	ZeroMemory(&bmi.bmiHeader,  sizeof(BITMAPINFOHEADER));
+	ZeroMemory(&bmi.bmiHeader, sizeof(BITMAPINFOHEADER));
 	bmi.bmiHeader.biSize        = sizeof(BITMAPINFOHEADER);
 	bmi.bmiHeader.biWidth       =  (int)m_dwTexWidth;
 	bmi.bmiHeader.biHeight      = -(int)m_dwTexHeight;
@@ -74,8 +74,8 @@ int CD3DFont::Init()
 	bmi.bmiHeader.biBitCount    = 32;
 
 	// Create a DC and a bitmap for the font
-	HDC 	hDC 	  = CreateCompatibleDC(NULL);
-	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (VOID**)&pBitmapBits, NULL, 0);
+	HDC hDC = CreateCompatibleDC(NULL);
+	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (void**)&pBitmapBits, NULL, 0);
 	SetMapMode(hDC, MM_TEXT);
 
 	// Create a font.  By specifying ANTIALIASED_QUALITY, we might get an
@@ -99,7 +99,7 @@ int CD3DFont::Init()
 	SetBkColor  (hDC, 0);
 	SetTextAlign(hDC, TA_TOP);
 
-	// Loop through all printable character and output them to the bitmap..
+	// Loop through all printable characters and output them to the bitmap
 	// Meanwhile, keep track of the corresponding tex coords for each character.
 	int x = 0, y = 0;
 	char str[2] = "\0";
@@ -120,10 +120,12 @@ int CD3DFont::Init()
 		m_fTexCoords[c][2] = ((float)(x+0+size.cx))/m_dwTexWidth;
 		m_fTexCoords[c][3] = ((float)(y+0+size.cy))/m_dwTexHeight;
 
-		x += size.cx + 3;  //3 to work around annoying ij conflict (part of the j ends up with the i)
+		x += size.cx + 3;  // 3 to work around annoying ij conflict (part of the j ends up with the i)
 	}
 
 	// Create a new texture for the font
+	// possible optimization: store the converted data in a buffer and fill the texture on creation.
+	//							That way, we can use a static texture
 	hr = dev->CreateTexture(m_dwTexWidth, m_dwTexHeight, 1, D3DUSAGE_DYNAMIC,
 							D3DFMT_A4R4G4B4, D3DPOOL_DEFAULT, &m_pTexture, NULL);
 	if (FAILED(hr))
@@ -245,7 +247,7 @@ int CD3DFont::DrawTextScaled(float x, float y, float fXScale, float fYScale, flo
 	float invLineHeight = 1.0f / ((m_fTexCoords[0][3] - m_fTexCoords[0][1]) * m_dwTexHeight);
 	// Fill vertex buffer
 	FONT2DVERTEX* pVertices;
-	int         dwNumTriangles = 0L;
+	int dwNumTriangles = 0L;
 	m_pVB->Lock(0, 0, (void**)&pVertices, D3DLOCK_DISCARD);
 
 	const char *oldstrText=strText;
@@ -296,7 +298,7 @@ int CD3DFont::DrawTextScaled(float x, float y, float fXScale, float fYScale, flo
 		if (c < (' '))
 			continue;
 
-		c-=32;
+		c -= 32;
 		float tx1 = m_fTexCoords[c][0];
 		float ty1 = m_fTexCoords[c][1];
 		float tx2 = m_fTexCoords[c][2];
@@ -329,7 +331,6 @@ int CD3DFont::DrawTextScaled(float x, float y, float fXScale, float fYScale, flo
 			m_pVB->Lock(0, 0, (void**)&pVertices, D3DLOCK_DISCARD);
 			dwNumTriangles = 0;
 		}
-
 		sx += w + spacing*fXScale*vpWidth;
 	}
 

Source/Plugins/Plugin_VideoDX9/Src/Debugger/Debugger.cpp

@@ -349,15 +349,15 @@ static void DX9DebuggerUpdateScreen()
 		D3D::dev->SetRenderTarget(0, D3D::GetBackBufferSurface());
 		D3D::dev->SetDepthStencilSurface(NULL);
 
-		D3D::dev->StretchRect(FBManager.GetEFBColorRTSurface(), NULL,
+		D3D::dev->StretchRect(g_framebufferManager.GetEFBColorRTSurface(), NULL,
 			D3D::GetBackBufferSurface(), NULL,
 			D3DTEXF_LINEAR);
 
 		D3D::dev->EndScene();
 		D3D::dev->Present(NULL, NULL, NULL, NULL);
 
-		D3D::dev->SetRenderTarget(0, FBManager.GetEFBColorRTSurface());
-		D3D::dev->SetDepthStencilSurface(FBManager.GetEFBDepthRTSurface());
+		D3D::dev->SetRenderTarget(0, g_framebufferManager.GetEFBColorRTSurface());
+		D3D::dev->SetDepthStencilSurface(g_framebufferManager.GetEFBDepthRTSurface());
 		D3D::dev->BeginScene();
 	}
 	else

Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp

@@ -145,14 +145,6 @@ void OSDMenu(WPARAM wParam)
 	case '3':
 		OSDChoice = 1;
 		// Toggle native resolution
-/*
-		if (!(g_Config.bNativeResolution || g_Config.b2xResolution))
-			g_Config.bNativeResolution = true;
-		else if (g_Config.bNativeResolution && Renderer::AllowCustom())
-			{ g_Config.bNativeResolution = false; if (Renderer::Allow2x()) {g_Config.b2xResolution = true;} }
-		else if (Renderer::AllowCustom())
-			g_Config.b2xResolution = false;
-*/
 		OSDInternalW = D3D::GetBackBufferWidth();
 		OSDInternalH = D3D::GetBackBufferHeight();
 		break;
@@ -224,6 +216,7 @@ HWND Create(HWND hParent, HINSTANCE hInstance, const TCHAR *title)
 	// TODO:
 	// 1. Remove redundant window manipulation,
 	// 2. Make DX9 in fullscreen can be overlapped by other dialogs
+	// 3. Request window sizes which actually make the client area map to a common resolution
 	HWND Ret;
 	int x=0, y=0, width=640, height=480;
 	g_VideoInitialize.pRequestWindowSize(x, y, width, height);

Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp

@@ -26,7 +26,7 @@
 #undef CHECK
 #define CHECK(hr, Message, ...) if (FAILED(hr)) { PanicAlert(__FUNCTION__ "Failed in %s at line %d: " Message, __FILE__, __LINE__, __VA_ARGS__); }
 
-FramebufferManager FBManager;
+FramebufferManager g_framebufferManager;
 
 LPDIRECT3DSURFACE9 FramebufferManager::GetEFBColorRTSurface()
 {
@@ -313,7 +313,6 @@ void FramebufferManager::copyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight
 	LPDIRECT3DTEXTURE9 xfbTexture;
 	HRESULT hr = 0;
 
-
 	VirtualXFBListType::iterator it = findVirtualXFB(xfbAddr, fbWidth, fbHeight);
 
 	if (it == m_virtualXFBList.end() && (int)m_virtualXFBList.size() >= MAX_VIRTUAL_XFB)
@@ -393,8 +392,7 @@ void FramebufferManager::copyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight
 		m_virtualXFBList.push_front(newVirt);
 	}
 
-	// Copy EFB to XFB texture
-
+	// Copy EFB data to XFB and restore render target again
 	if(!xfbTexture)
 		return;
 	LPDIRECT3DTEXTURE9 read_texture = GetEFBColorTexture(sourceRc);