ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed some temp logging, minor other stuff 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@154 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-08-08 20:38:08 +00:00
parent 9626b3bc42
commit a9b441f379
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
View File

@ -233,10 +233,14 @@ namespace Jit64
bool FPURegCache::IsXRegVolatile(X64Reg reg) const bool FPURegCache::IsXRegVolatile(X64Reg reg) const
{ {
#ifdef _WIN32
if (reg < 6) if (reg < 6)
return true; return true;
else else
return false; return false;
#else
return true;
#endif
} }
void GPRRegCache::Start(PPCAnalyst::BlockRegStats &stats) void GPRRegCache::Start(PPCAnalyst::BlockRegStats &stats)

6
Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
View File

@ -40,7 +40,6 @@ namespace Jit64
void fp_tri_op(int d, int a, int b, bool reversible, bool dupe, void (*op)(X64Reg, OpArg)) void fp_tri_op(int d, int a, int b, bool reversible, bool dupe, void (*op)(X64Reg, OpArg))
{ {
fpr.Lock(d, a, b); fpr.Lock(d, a, b);
if (d == a) if (d == a)
{ {
fpr.GetReadyForOp(d, b); fpr.GetReadyForOp(d, b);
@ -176,7 +175,10 @@ namespace Jit64
} }
AND(32, M(&CR), Imm32(~(0xF0000000 >> shift))); 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 pLesser = J_CC(CC_B);
FixupBranch pGreater = J_CC(CC_A); FixupBranch pGreater = J_CC(CC_A);
// _x86Reg == 0 // _x86Reg == 0

2
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.cpp
View File

@ -211,7 +211,7 @@ bool PixelShaderMngr::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpro
} }
cgDestroyProgram(tempprog); cgDestroyProgram(tempprog);
printf("Compiled pixel shader %i\n", ps.glprogid); // printf("Compiled pixel shader %i\n", ps.glprogid);
#ifdef _DEBUG #ifdef _DEBUG
ps.strprog = pstrprogram; ps.strprog = pstrprogram;

2
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h
View File

@ -99,7 +99,7 @@ class PixelShaderMngr
PSCacheEntry() : frameCount(0) {} PSCacheEntry() : frameCount(0) {}
~PSCacheEntry() {} ~PSCacheEntry() {}
void Destroy() { void Destroy() {
printf("Destroying ps %i\n", shader.glprogid); // printf("Destroying ps %i\n", shader.glprogid);
glDeleteProgramsARB(1, &shader.glprogid); glDeleteProgramsARB(1, &shader.glprogid);
shader.glprogid = 0; shader.glprogid = 0;
} }

2
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
View File

@ -183,7 +183,7 @@ bool VertexShaderMngr::CompileVertexShader(VERTEXSHADER& vs, const char* pstrpro
} }
cgDestroyProgram(tempprog); cgDestroyProgram(tempprog);
printf("Compiled vertex shader %i\n", vs.glprogid); // printf("Compiled vertex shader %i\n", vs.glprogid);
#ifdef _DEBUG #ifdef _DEBUG
vs.strprog = pstrprogram; vs.strprog = pstrprogram;

2
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h
View File

@ -41,7 +41,7 @@ class VertexShaderMngr
int frameCount; int frameCount;
VSCacheEntry() : frameCount(0) {} VSCacheEntry() : frameCount(0) {}
void Destroy() { void Destroy() {
printf("Destroying vs %i\n", shader.glprogid); // printf("Destroying vs %i\n", shader.glprogid);
glDeleteProgramsARB(1, &shader.glprogid); glDeleteProgramsARB(1, &shader.glprogid);
shader.glprogid = 0; shader.glprogid = 0;
} }