summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-09 18:46:41 +0000
committerSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-09 18:46:41 +0000
commit70ab51af6699f7b967645b19772dfecab4ef959a (patch)
tree1feda8f9344185d52ac5dec225018b36f57f018c
parent626eb657588e3ef91e522d644811ca4becdc1c23 (diff)
downloadpcsxr-70ab51af6699f7b967645b19772dfecab4ef959a.tar.gz
psxRcntFreeze() was fixed.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47708 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--AUTHORS2
-rw-r--r--ChangeLog5
-rw-r--r--libpcsxcore/psxcounters.c4
-rw-r--r--plugins/dfxvideo/prim.c5
4 files changed, 14 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 60aa31ab..3ec04ddd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,7 +21,7 @@ df Copyright: (C) 2005 Ryan Schultz
PCSX-Reloaded Authors/Contributors: avlex (Help on xcode project)
dario86 (Various bugfixes)
- edgbla (Root counter, various core/plugin fixes)
+ edgbla (Root counters, various core/plugin fixes)
Gabriele Gorla (MDEC decoder)
maggix (Snow Leopard compile fix)
NeToU (Bugfix)
diff --git a/ChangeLog b/ChangeLog
index 71c0cfbe..58581124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+May 9, 2010 edgbla <edgbla@yandex.ru>
+
+ * libpcsxcore/psxcounters.c: psxRcntFreeze was fixed.
+ * plugins/dfxvideo/prim.c: Returned some code (iGPUHeight=1024), IMO, it's wrong, can't perform the tests.
+
May 9, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* libpcsxcore/plugins.c: Removed support for ancient GPU/SPU plugin APIs.
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index ebfb0612..12b84117 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -465,9 +465,11 @@ void psxRcntInit()
s32 psxRcntFreeze( gzFile f, s32 Mode )
{
- s8 unused[ 4096 - sizeof(rcnts) ];
+ s8 unused[ 4096 - (sizeof(rcnts) + sizeof(hSyncCount) + sizeof(spuSyncCount)) ];
gzfreezel( rcnts );
+ gzfreeze( &hSyncCount, sizeof(hSyncCount) );
+ gzfreeze( &spuSyncCount, sizeof(spuSyncCount) );
gzfreezel( unused );
return 0;
diff --git a/plugins/dfxvideo/prim.c b/plugins/dfxvideo/prim.c
index 0dfc08a6..4ffa5214 100644
--- a/plugins/dfxvideo/prim.c
+++ b/plugins/dfxvideo/prim.c
@@ -77,7 +77,12 @@ __inline void UpdateGlobalTP(unsigned short gdata)
GlobalTextABR = (unsigned short)((gdata >> 7) & 0x3);
GlobalTextTP = (gdata >> 9) & 0x3;
if(GlobalTextTP==3) GlobalTextTP=2;
+ usMirror =0;
lGPUstatusRet = (lGPUstatusRet & 0xffffe000 ) | (gdata & 0x1fff );
+
+ // tekken dithering? right now only if dithering is forced by user
+ if(iUseDither==2) iDither=2; else iDither=0;
+
return;
}
else