revert to r4531, but keep the changes from the following revisions: 4533,4550-4551,4556-4559

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

Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp

@@ -398,18 +398,18 @@ void drawShadedTexQuad(IDirect3DTexture9 *texture,
 {
 	SaveRenderStates();
 	
-	//float span = ((rSource->right-rSource->left - 1.0f) * (rDest->right - rDest->left))/(SourceWidth*((rDest->right - rDest->left)-1.0f));
-	float u1=((float)rSource->left+1.0f)/(float) SourceWidth;//*/((0.5f+rSource->left)/(float) SourceWidth)-(span*0.5f/(float)(rDest->right - rDest->left));
-	float u2=((float)rSource->right-1.0f)/(float) SourceWidth;;//*/u1+span;  
-	//span = ((rSource->bottom-rSource->top - 1.0f) * (rDest->bottom - rDest->top))/(SourceHeight*((rDest->bottom - rDest->top)-1.0f));
-	float v1=((float)rSource->top+1.0f)/(float) SourceHeight;//*/((0.5f+rSource->top)/(float) SourceHeight)-(span*0.5f/(float)(rDest->bottom - rDest->top));
-	float v2=((float)rSource->bottom-1.0f)/(float) SourceHeight;//*/v1+span; 
+	float span = ((rSource->right-rSource->left - 1.0f) * (rDest->right - rDest->left))/(SourceWidth*((rDest->right - rDest->left)-1.0f));
+	float u1=((0.5f+rSource->left)/(float) SourceWidth)-(span*0.5f/(float)(rDest->right - rDest->left));
+	float u2=u1+span;  
+	span = ((rSource->bottom-rSource->top - 1.0f) * (rDest->bottom - rDest->top))/(SourceHeight*((rDest->bottom - rDest->top)-1.0f));
+	float v1=((0.5f+rSource->top)/(float) SourceHeight)-(span*0.5f/(float)(rDest->bottom - rDest->top));
+	float v2=v1+span; 
 
 	struct Q2DVertex { float x,y,z,rhw,u,v; } coords[4] = {
-		{(float)rDest->left-0.5f, (float)rDest->top-0.5f, 0.0f, 1.0f, u1, v1},
-		{(float)rDest->right-0.5f, (float)rDest->top-0.5f, 0.0f,1.0f, u2, v1},
-		{(float)rDest->right-0.5f, (float)rDest->bottom-0.5f, 0.0f,1.0f, u2, v2},
-		{(float)rDest->left-0.5f, (float)rDest->bottom-0.5f, 0.0f,1.0f, u1, v2}
+		{(float)rDest->left-1.0f, (float)rDest->top-1.0f, 0.0f, 1.0f, u1, v1},
+		{(float)rDest->right, (float)rDest->top-1.0f, 0.0f,1.0f, u2, v1},
+		{(float)rDest->right, (float)rDest->bottom, 0.0f,1.0f, u2, v2},
+		{(float)rDest->left-1.0f, (float)rDest->bottom, 0.0f,1.0f, u1, v2}
 	};
 	dev->SetFVF(D3DFVF_XYZRHW | D3DFVF_TEX1);
 	dev->SetVertexShader(Vshader);

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

@@ -359,9 +359,6 @@ static void DX9DebuggerUpdateScreen()
 		D3D::dev->Present(NULL, NULL, NULL, NULL);
 
 		D3D::dev->SetRenderTarget(0, FBManager::GetEFBColorRTSurface());
-
-		if(D3D::GetCaps().NumSimultaneousRTs > 1)
-			D3D::dev->SetRenderTarget(1,FBManager::GetEFBDepthEncodedSurface());
 		D3D::dev->SetDepthStencilSurface(FBManager::GetEFBDepthRTSurface());
 		D3D::dev->BeginScene();
 	}

Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp

@@ -10,7 +10,6 @@
 namespace EmuWindow
 {
 HWND m_hWnd = NULL;
-HWND m_hMain = NULL;
 HWND m_hParent = NULL;
 HINSTANCE m_hInstance = NULL;
 WNDCLASSEX wndClass;
@@ -37,9 +36,6 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 {
 	switch( iMsg )
 	{
-	case WM_CREATE:
-		PostMessage( m_hMain, WM_USER, WM_USER_CREATE, g_Config.RenderToMainframe );
-		break;
 	case WM_PAINT:
 		{
 			HDC hdc;
@@ -58,18 +54,9 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 		break;
 
 	case WM_KEYDOWN:
-		switch (LOWORD(wParam))
-		{
-			case VK_ESCAPE:
-				SendMessage(m_hWnd, WM_CLOSE, 0, 0);
-				break;
-		}
-		g_VideoInitialize.pKeyPress(LOWORD(wParam), GetAsyncKeyState(VK_SHIFT) != 0, GetAsyncKeyState(VK_CONTROL) != 0);
-		break;
-	case WM_SYSKEYDOWN:
 		switch( LOWORD( wParam ))
 		{
-			case VK_RETURN:   // Pressing Esc switch FullScreen/Windowed
+			case VK_ESCAPE:   // Pressing Esc switch FullScreen/Windowed
 				if (g_ActiveConfig.bFullscreen)
 				{
 					DestroyWindow(hWnd);
@@ -131,7 +118,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 				}*/
 				break;
 		}
-		//g_VideoInitialize.pKeyPress(LOWORD(wParam), GetAsyncKeyState(VK_SHIFT) != 0, GetAsyncKeyState(VK_CONTROL) != 0);
+		g_VideoInitialize.pKeyPress(LOWORD(wParam), GetAsyncKeyState(VK_SHIFT) != 0, GetAsyncKeyState(VK_CONTROL) != 0);
 		break;
 
 	/* Post thes mouse events to the main window, it's nessesary because in difference to the
@@ -145,7 +132,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 	case WM_CLOSE:
 		//Fifo_ExitLoopNonBlocking();
 		//Shutdown();
-		PostMessage( m_hMain, WM_USER, WM_USER_STOP, 0 );
+		PostMessage( m_hParent, WM_USER, OPENGL_WM_USER_STOP, 0 );
 		// Simple hack to easily exit without stopping. Hope to fix the stopping errors soon.
 		//ExitProcess(0);
 		return 0;
@@ -200,7 +187,7 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T
 
 	if (g_Config.RenderToMainframe)
 	{
-		m_hParent = m_hMain = parent;
+		m_hParent = parent;
 
 		m_hWnd = CreateWindowEx(0, m_szClassName, title, WS_CHILD,
 			0, 0, width, height,
@@ -211,8 +198,6 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T
 	}
 	else
 	{
-		m_hMain = parent;
-
 		DWORD style = g_Config.bFullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW;
 
 		RECT rc = {0, 0, width, height};
@@ -228,7 +213,7 @@ HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const T
 
 		m_hWnd = CreateWindowEx(0, m_szClassName, title, style,
 			rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top,
-			NULL, NULL, hInstance, NULL);
+			NULL, NULL, hInstance, NULL );
 	}
 
 	return m_hWnd;

Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp

@@ -75,31 +75,6 @@ void TextureCache::Invalidate(bool shutdown)
 	textures.clear();
 }
 
-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);
-			ERASE_THROUGH_ITERATOR(textures, 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);
@@ -208,7 +183,6 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
 	D3DFORMAT d3d_fmt;
 	switch (pcfmt) {
 	case PC_TEX_FMT_BGRA32:
-	case PC_TEX_FMT_RGBA32:
 		d3d_fmt = D3DFMT_A8R8G8B8;
 		break;
 	case PC_TEX_FMT_RGB565:
@@ -230,7 +204,7 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
 		d3d_fmt = D3DFMT_DXT1;
 		break;
 	}
-	
+
 	//Make an entry in the table
 	TCacheEntry& entry = textures[texID];
 
@@ -336,7 +310,25 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, boo
 		tex = entry.texture;
 	}
 
-have_texture:	
+have_texture:
+	/*TargetRectangle targetSource = Renderer::ConvertEFBRectangle(source_rect);
+	RECT source_rc;
+	source_rc.left = targetSource.left;
+	source_rc.top = targetSource.top;
+	source_rc.right = targetSource.right;
+	source_rc.bottom = targetSource.bottom;
+	RECT dest_rc;
+	dest_rc.left = 0;
+	dest_rc.top = 0;
+	dest_rc.right = tex_w;
+	dest_rc.bottom = tex_h;
+
+	LPDIRECT3DSURFACE9 srcSurface, destSurface;
+	tex->GetSurfaceLevel(0, &destSurface);
+	srcSurface = FBManager::GetEFBColorRTSurface();
+	D3D::dev->StretchRect(srcSurface, &source_rc, destSurface, &dest_rc, D3DTEXF_LINEAR);
+	destSurface->Release();
+	return;*/
 	float colmat[16]= {0.0f};
 	float fConstAdd[4] = {0.0f};	
 
@@ -454,8 +446,7 @@ have_texture:
 	hr = tex->GetSurfaceLevel(0,&Rendersurf);
 	CHECK(hr);
 	D3D::dev->SetDepthStencilSurface(NULL);
-	if(D3D::GetCaps().NumSimultaneousRTs > 1)
-		D3D::dev->SetRenderTarget(1, NULL);
+	D3D::dev->SetRenderTarget(1, NULL);
 	D3D::dev->SetRenderTarget(0, Rendersurf);		
     
 	D3DVIEWPORT9 vp;
@@ -477,18 +468,17 @@ have_texture:
 	
 
 	PixelShaderManager::SetColorMatrix(colmat, fConstAdd); // set transformation
-	TargetRectangle targetSource = Renderer::ConvertEFBRectangle(source_rect);
+	//TargetRectangle targetSource = Renderer::ConvertEFBRectangle(source_rect);
 	RECT sourcerect;
-	sourcerect.bottom = targetSource.bottom;
-	sourcerect.left = targetSource.left;
-	sourcerect.right = targetSource.right;
-	sourcerect.top = targetSource.top;
+	sourcerect.bottom = source_rect.bottom;
+	sourcerect.left = source_rect.left;
+	sourcerect.right = source_rect.right;
+	sourcerect.top = source_rect.top;
 
-	D3D::drawShadedTexQuad(read_texture,&sourcerect, Renderer::GetTargetWidth() , Renderer::GetTargetHeight(),&destrect,(FBManager::GetEFBDepthRTSurfaceFormat() == D3DFMT_R32F && bFromZBuffer)?  PixelShaderCache::GetDepthMatrixProgram(): PixelShaderCache::GetColorMatrixProgram(),VertexShaderCache::GetSimpleVertexSahder());	
+	D3D::drawShadedTexQuad(read_texture,&sourcerect, EFB_WIDTH , EFB_HEIGHT,&destrect,(FBManager::GetEFBDepthRTSurfaceFormat() == D3DFMT_R32F && bFromZBuffer)?  PixelShaderCache::GetDepthMatrixProgram(): PixelShaderCache::GetColorMatrixProgram(),NULL);	
 
 	D3D::dev->SetRenderTarget(0, FBManager::GetEFBColorRTSurface());
-	if(D3D::GetCaps().NumSimultaneousRTs > 1)
-		D3D::dev->SetRenderTarget(1, FBManager::GetEFBDepthEncodedSurface());
+	D3D::dev->SetRenderTarget(1, FBManager::GetEFBDepthEncodedSurface());
 	D3D::dev->SetDepthStencilSurface(FBManager::GetEFBDepthRTSurface());
 	VertexShaderManager::SetViewportChanged();
 	Renderer::RestoreAPIState();	

Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h

@@ -53,7 +53,6 @@ public:
 			oldpixel = 0;
 		}
 		void Destroy(bool shutdown);
-		bool IntersectsMemoryRange(u32 range_address, u32 range_size);
 	};
 
 private:
@@ -68,7 +67,6 @@ public:
 	static void Cleanup();
 	static void Shutdown();
 	static void Invalidate(bool shutdown);
-	static void InvalidateRange(u32 start_address, u32 size);
 	static TCacheEntry *Load(int stage, u32 address, int width, int height, int format, int tlutaddr, int tlutfmt);
 	static void CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle &source_rect);
 };