apply some speedup to dx11 plugin + some minor stuff

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

Source/Core/VideoCommon/Src/IndexGenerator.cpp

@@ -130,7 +130,7 @@ void IndexGenerator::AddStrip(int numVerts)
 		//if we have less than 3 verts
 		if(numVerts == 1)
 		{
-			//dicard
+			// discard
 			index++;
 			return;
 		}
@@ -341,9 +341,3 @@ void IndexGenerator::AddPoints(int numVerts)
 	numP += numVerts;
 	Padds++;
 }
-
-
-
-
-	
-

Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp

@@ -294,7 +294,7 @@ HRESULT Create(HWND wnd)
 	{
 		// try using the first one
 		hr = factory->EnumAdapters(0, &adapter);
-		if (FAILED(hr)) MessageBox(wnd, _T("Failed to enumerate adapter"), _T("Dolphin Direct3D 11 plugin"), MB_OK | MB_ICONERROR);
+		if (FAILED(hr)) MessageBox(wnd, _T("Failed to enumerate adapters"), _T("Dolphin Direct3D 11 plugin"), MB_OK | MB_ICONERROR);
 	}
 
 	// TODO: Make this configurable
@@ -303,7 +303,7 @@ HRESULT Create(HWND wnd)
 	{
 		// try using the first one
 		hr = adapter->EnumOutputs(0, &output);
-		if (FAILED(hr)) MessageBox(wnd, _T("Failed to enumerate output"), _T("Dolphin Direct3D 11 plugin"), MB_OK | MB_ICONERROR);
+		if (FAILED(hr)) MessageBox(wnd, _T("Failed to enumerate outputs"), _T("Dolphin Direct3D 11 plugin"), MB_OK | MB_ICONERROR);
 	}
 
 	// this will need to be changed once multisampling gets implemented

Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp

@@ -68,8 +68,8 @@ void ReplaceTexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int
 	// TODO: Merge the conversions done here to VideoDecoder
 	switch (pcfmt)
 	{
-		case PC_TEX_FMT_IA4_AS_IA8:
 		case PC_TEX_FMT_IA8:
+		case PC_TEX_FMT_IA4_AS_IA8:
 			for (unsigned int y = 0; y < height; y++)
 			{
 				u16* in = (u16*)buffer + y * pitch;
@@ -78,43 +78,30 @@ void ReplaceTexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int
 				{
 					const u8 I = (*in & 0xFF);
 					const u8 A = (*in & 0xFF00) >> 8;
-					*pBits = (A << 24) | (I << 16) | (I << 8) | I;
+					*(pBits++) = (A << 24) | (I << 16) | (I << 8) | I;
 					in++;
-					pBits++;
 				}
 			}
 			break;
 		case PC_TEX_FMT_I8:
 		case PC_TEX_FMT_I4_AS_I8:
+			for (unsigned int y = 0; y < height; y++)
 			{
-				const u8 *pIn = buffer;
+				const u8* in = buffer + (y * pitch);
-				for (int y = 0; y < height; y++)
+				u32* pBits = (u32*)((u8*)outptr + (y * destPitch));
+				for(unsigned int i = 0; i < width; i++)
 				{
-					u8* pBits = ((u8*)outptr + (y * destPitch));
+					const u8 I = *(in++);
-					for(int i = 0; i < width * 4; i += 4) 
+					memset( pBits++, I, 4 );
-					{
-						pBits[i] = pIn[i / 4];
-						pBits[i+1] = pIn[i / 4];
-						pBits[i+2] = pIn[i / 4];
-						pBits[i + 3] = pIn[i / 4];
-					}
-					pIn += pitch;
 				}
 			}
-			
 			break;
 		case PC_TEX_FMT_BGRA32:
 			for (unsigned int y = 0; y < height; y++)
 			{
 				u32* in = (u32*)buffer + y * pitch;
 				u32* pBits = (u32*)((u8*)outptr + y * destPitch);
-				for (unsigned int x = 0; x < width; x++)
+				memcpy( pBits, in, destPitch );
-				{
-					const u32 col = *in;
-					*pBits = col;
-					in++;
-					pBits++;
-				}
 			}
 			break;
 		case PC_TEX_FMT_RGB565:
@@ -125,13 +112,11 @@ void ReplaceTexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int
 				for (unsigned int x = 0; x < width; x++)
 				{
 					// we can't simply shift here, since e.g. 11111 must map to 11111111 and not 11111000
-					const u16 col = *in;
+					const u16 col = *(in++);
-					*pBits = 0xFF000000 | // alpha
+					*(pBits++) = 0xFF000000 | // alpha
 							((((col&0xF800) << 5) * 255 / 31) & 0xFF0000) | // red
 							((((col& 0x7e0) << 3) * 255 / 63) & 0xFF00) |   // green
 							(( (col&  0x1f)       * 255 / 31));             // blue
-					pBits++;
-					in++;
 				}
 			}
 			break;

Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp

@@ -354,6 +354,7 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
 	DEBUGGER_PAUSE_LOG_AT(NEXT_NEW_TEXTURE,true,{printf("A new texture (%d x %d) is loaded", width, height);});
 	return &entry;
 }
+
 void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle &source_rect)
 {
 	int efb_w = source_rect.GetWidth();

Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp

@@ -147,6 +147,7 @@ HWND GetWnd()
 {
 	return m_hWnd;
 }
+
 HWND GetParentWnd()
 {
 	return m_hParent;
@@ -305,7 +306,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 	
 }
 
-
 // This is called from Create()
 HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const TCHAR *title)
 {

Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp

@@ -366,7 +366,6 @@ void Flush()
 
 	GL_REPORT_ERRORD();
 
-	
 }
 }  // namespace
 

Source/Plugins/Plugin_VideoOGL/Src/main.cpp

@@ -234,7 +234,8 @@ void Initialize(void *init)
 	OSD::AddMessage("Dolphin OpenGL Video Plugin", 5000);
 }
 
-void DoState(unsigned char **ptr, int mode) {
+void DoState(unsigned char **ptr, int mode)
+{
 #if defined(HAVE_X11) && HAVE_X11
 	OpenGL_MakeCurrent();
 #endif
@@ -351,7 +352,8 @@ void Video_AddMessage(const char* pstr, u32 milliseconds)
 	OSD::AddMessage(pstr, milliseconds);
 }
 
-void Video_SetRendering(bool bEnabled) {
+void Video_SetRendering(bool bEnabled)
+{
 	Fifo_SetRendering(bEnabled);
 }