thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use __KernelTriggerWait in sceDisplay

Browse source
This commit is contained in:
Henrik Rydgard 2012-12-17 20:14:06 +01:00
parent 1e086f5008
commit cb29c1ce4b
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Core/HLE/sceDisplay.cpp
View file

@ -85,8 +85,9 @@ enum {
struct WaitVBlankInfo struct WaitVBlankInfo
{ {
WaitVBlankInfo(u32 tid) : threadID(tid), vcountUnblock(0) {}
u32 threadID; u32 threadID;
int vcountUnblock; int vcountUnblock; // what was this for again?
}; };
std::vector<WaitVBlankInfo> vblankWaitingThreads; std::vector<WaitVBlankInfo> vblankWaitingThreads;
@ -144,7 +145,10 @@ void hleEnterVblank(u64 userdata, int cyclesLate)
__DisplayFireVblank(); __DisplayFireVblank();
// Wake up threads waiting for VBlank // Wake up threads waiting for VBlank
__KernelTriggerWait(WAITTYPE_VBLANK, 0, true); for (int i = 0; i < vblankWaitingThreads.size(); i++) {
__KernelResumeThreadFromWait(vblankWaitingThreads[i].threadID, 0);
}
vblankWaitingThreads.clear();
// Trigger VBlank interrupt handlers. // Trigger VBlank interrupt handlers.
__TriggerInterrupt(PSP_VBLANK_INTR); __TriggerInterrupt(PSP_VBLANK_INTR);
@ -201,7 +205,6 @@ void hleEnterVblank(u64 userdata, int cyclesLate)
gpuStats.resetFrame(); gpuStats.resetFrame();
} }
host->EndFrame(); host->EndFrame();
#ifdef _WIN32 #ifdef _WIN32
@ -318,36 +321,42 @@ u32 sceDisplayGetFramebuf(u32 topaddrPtr, u32 linesizePtr, u32 pixelFormatPtr, i
void sceDisplayWaitVblankStart() void sceDisplayWaitVblankStart()
{ {
DEBUG_LOG(HLE,"sceDisplayWaitVblankStart()"); DEBUG_LOG(HLE,"sceDisplayWaitVblankStart()");
vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false); __KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false);
} }
void sceDisplayWaitVblank() void sceDisplayWaitVblank()
{ {
DEBUG_LOG(HLE,"sceDisplayWaitVblank()"); DEBUG_LOG(HLE,"sceDisplayWaitVblank()");
vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false); __KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false);
} }
void sceDisplayWaitVblankStartMulti() void sceDisplayWaitVblankStartMulti()
{ {
DEBUG_LOG(HLE,"sceDisplayWaitVblankStartMulti()"); DEBUG_LOG(HLE,"sceDisplayWaitVblankStartMulti()");
vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false); __KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false);
} }
void sceDisplayWaitVblankCB() void sceDisplayWaitVblankCB()
{ {
DEBUG_LOG(HLE,"sceDisplayWaitVblankCB()"); DEBUG_LOG(HLE,"sceDisplayWaitVblankCB()");
vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true); __KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true);
} }
void sceDisplayWaitVblankStartCB() void sceDisplayWaitVblankStartCB()
{ {
DEBUG_LOG(HLE,"sceDisplayWaitVblankStartCB()"); DEBUG_LOG(HLE,"sceDisplayWaitVblankStartCB()");
vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true); __KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true);
} }
void sceDisplayWaitVblankStartMultiCB() void sceDisplayWaitVblankStartMultiCB()
{ {
DEBUG_LOG(HLE,"sceDisplayWaitVblankStartMultiCB()"); DEBUG_LOG(HLE,"sceDisplayWaitVblankStartMultiCB()");
vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true); __KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true);
} }

4
Core/HLE/sceKernelThread.h
View file

@ -104,7 +104,9 @@ SceUID __KernelGetCurThread();
void __KernelSaveContext(ThreadContext *ctx); void __KernelSaveContext(ThreadContext *ctx);
void __KernelLoadContext(ThreadContext *ctx); void __KernelLoadContext(ThreadContext *ctx);
// TODO: Replace this with __KernelResumeThread over time as it's misguided. // TODO: Replace this with __KernelResumeThreadFromWait over time as it's misguided.
// It's better that each subsystem keeps track of the list of waiting threads
// and resumes them manually one by one using __KernelResumeThreadFromWait.
bool __KernelTriggerWait(WaitType type, int id, bool dontSwitch = false); bool __KernelTriggerWait(WaitType type, int id, bool dontSwitch = false);
bool __KernelTriggerWait(WaitType type, int id, int retVal, bool dontSwitch); bool __KernelTriggerWait(WaitType type, int id, int retVal, bool dontSwitch);
u32 __KernelResumeThreadFromWait(SceUID threadID); // can return an error value u32 __KernelResumeThreadFromWait(SceUID threadID); // can return an error value