libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-30 21:33:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix save status

Browse Source 
Rename u32_le stackAddr to u32
This commit is contained in:
sum2012 2014-08-17 16:52:06 +08:00
parent 8099281928
commit 5ac70026c7
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
GPU/GPUCommon.cpp
View File

@ -1009,7 +1009,7 @@ void GPUCommon::FastLoadBoneMatrix(u32 target) {
gstate.FastLoadBoneMatrix(target);
}
struct DisplayListOld {
struct DisplayList_v1 {
int id;
u32 startpc;
u32 pc;
@ -1030,20 +1030,49 @@ struct DisplayListOld {
bool bboxResult;
};
struct DisplayList_v2 {
int id;
u32 startpc;
u32 pc;
u32 stall;
DisplayListState state;
SignalBehavior signal;
int subIntrBase;
u16 subIntrToken;
DisplayListStackEntry stack[32];
int stackptr;
bool interrupted;
u64 waitTicks;
bool interruptsEnabled;
bool pendingInterrupt;
bool started;
PSPPointer<u32_le> context;
u32 offsetAddr;
bool bboxResult;
};
void GPUCommon::DoState(PointerWrap &p) {
easy_guard guard(listLock);
auto s = p.Section("GPUCommon", 1, 2);
auto s = p.Section("GPUCommon", 1, 3);
if (!s)
return;
p.Do<int>(dlQueue);
if (s >= 2) {
if (s >= 3) {
p.DoArray(dls, ARRAY_SIZE(dls));
} else if (s >= 2) {
for (size_t i = 0; i < ARRAY_SIZE(dls); ++i) {
DisplayList_v2 oldDL;
p.Do(oldDL);
// Copy over everything except the last, new member (stackAddr.)
memcpy(&dls[i], &oldDL, sizeof(DisplayList_v2));
dls[i].stackAddr = 0;
}
} else {
// Can only be in read mode here.
for (size_t i = 0; i < ARRAY_SIZE(dls); ++i) {
DisplayListOld oldDL;
DisplayList_v1 oldDL;
p.Do(oldDL);
// On 32-bit, they're the same, on 64-bit oldDL is bigger.
memcpy(&dls[i], &oldDL, sizeof(DisplayList));
@ -1051,6 +1080,7 @@ void GPUCommon::DoState(PointerWrap &p) {
dls[i].context = 0;
dls[i].offsetAddr = oldDL.offsetAddr;
dls[i].bboxResult = oldDL.bboxResult;
dls[i].stackAddr = 0;
}
}
int currentID = 0;

2
GPU/GPUInterface.h
View File

@ -142,7 +142,7 @@ struct DisplayList
PSPPointer<u32_le> context;
u32 offsetAddr;
bool bboxResult;
u32_le stackAddr;
u32 stackAddr;
};
enum GPUInvalidationType {