From a9b441f379480a73e15cd45ee7e43500980db3ee Mon Sep 17 00:00:00 2001
From: hrydgard <hrydgard@gmail.com>
Date: Fri, 8 Aug 2008 20:38:08 +0000
Subject: [PATCH] Removed some temp logging, minor other stuff

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@154 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp         | 4 ++++
 Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp   | 6 ++++--
 Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp  | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h    | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h   | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
index 15618ff82e..c29b703df0 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
@@ -233,10 +233,14 @@ namespace Jit64
 
 	bool FPURegCache::IsXRegVolatile(X64Reg reg) const
 	{
+#ifdef _WIN32
 		if (reg < 6) 
 			return true;
 		else
 			return false;
+#else
+		return true;
+#endif
 	}
 
 	void GPRRegCache::Start(PPCAnalyst::BlockRegStats &stats)
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
index 6cb68576d0..2de2fc894e 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -40,7 +40,6 @@ namespace Jit64
 	void fp_tri_op(int d, int a, int b, bool reversible, bool dupe, void (*op)(X64Reg, OpArg))
 	{
 		fpr.Lock(d, a, b);
-
 		if (d == a)
 		{
 			fpr.GetReadyForOp(d, b);
@@ -176,7 +175,10 @@ namespace Jit64
 		}
 
 		AND(32, M(&CR), Imm32(~(0xF0000000 >> shift)));
-		(ordered ? COMISD : UCOMISD)(fpr.R(a).GetSimpleReg(), fpr.R(b));
+		if (ordered)
+			COMISD(fpr.R(a).GetSimpleReg(), fpr.R(b));
+		else
+			UCOMISD(fpr.R(a).GetSimpleReg(), fpr.R(b));
 		FixupBranch pLesser  = J_CC(CC_B);
 		FixupBranch pGreater = J_CC(CC_A);
 		// _x86Reg == 0
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp
index 00e3e6a495..63018f6fdc 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp
@@ -211,7 +211,7 @@ bool PixelShaderMngr::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpro
     }
 
     cgDestroyProgram(tempprog);
-	printf("Compiled pixel shader %i\n", ps.glprogid);
+	// printf("Compiled pixel shader %i\n", ps.glprogid);
 
 #ifdef _DEBUG
     ps.strprog = pstrprogram;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h
index b540801a36..7a75b28c41 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h
@@ -99,7 +99,7 @@ class PixelShaderMngr
         PSCacheEntry() : frameCount(0) {}
 		~PSCacheEntry() {}
         void Destroy() {
-			printf("Destroying ps %i\n", shader.glprogid);
+			// printf("Destroying ps %i\n", shader.glprogid);
             glDeleteProgramsARB(1, &shader.glprogid);
 			shader.glprogid = 0;
         }
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
index 848b7f6dc9..e21b67ffdf 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
@@ -183,7 +183,7 @@ bool VertexShaderMngr::CompileVertexShader(VERTEXSHADER& vs, const char* pstrpro
     }
 
     cgDestroyProgram(tempprog);
-	printf("Compiled vertex shader %i\n", vs.glprogid);
+	// printf("Compiled vertex shader %i\n", vs.glprogid);
 
 #ifdef _DEBUG
     vs.strprog = pstrprogram;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h
index 9fef282aea..017c719582 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h
@@ -41,7 +41,7 @@ class VertexShaderMngr
         int frameCount;
         VSCacheEntry() : frameCount(0) {}
         void Destroy() {
-			printf("Destroying vs %i\n", shader.glprogid);
+			// printf("Destroying vs %i\n", shader.glprogid);
             glDeleteProgramsARB(1, &shader.glprogid);
 			shader.glprogid = 0;
         }