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

reverted last revisions to prevent possible syncing problems/crashes. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@141 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
cottonvibes 2008-09-23 18:57:53 +00:00 committed by Gregory Hainaut
parent 5eb9108814
commit 4a1fbd5279
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Misc.c
View File

@ -636,7 +636,7 @@ int LoadState(char *file) {
}
// stop and reset the system first
//gsWaitGS();
gsWaitGS();
for (i=0; i<48; i++) ClearTLB(i);
@ -716,7 +716,7 @@ int LoadState(char *file) {
// have to call in thread, otherwise weird stuff will start happening
u64 uf = (uptr)f;
GSRingBufSimplePacket(GS_RINGTYPE_LOAD, (u32)(uf&0xffffffff), (u32)(uf>>32), 0);
// gsWaitGS();
gsWaitGS();
}
else {
_PS2Eload(GS);

2
pcsx2/R5900.c
View File

@ -419,7 +419,7 @@ void cpuBranchTest()
// stall mtgs if it is taking too long
if( g_MTGSVifCount > 0 ) {
if( cpuRegs.cycle-g_MTGSVifStart > g_MTGSVifCount ) {
// gsWaitGS();
gsWaitGS();
g_MTGSVifCount = 0;
}
}