Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4556 from unknownbrackets/ctrl-timing

Browse source 
Adjust ctrl timing (sample and wake after vblank)
This commit is contained in:
Henrik Rydgård 2013-11-18 05:06:58 -08:00
commit 428b27903b
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Core/HLE/sceCtrl.cpp
View file

@ -114,7 +114,7 @@ void __CtrlUpdateLatch()
latch.btnMake |= buttons & changed;
latch.btnBreak |= ctrlOldButtons & changed;
latch.btnPress |= buttons;
latch.btnRelease |= (ctrlOldButtons & ~buttons) & changed;
latch.btnRelease |= ~buttons;
dialogBtnMake |= buttons & changed;
ctrlLatchBufs++;
@ -195,10 +195,8 @@ void __CtrlSetRapidFire(bool state)
emuRapidFire = state;
}
int __CtrlReadSingleBuffer(u32 ctrlDataPtr, bool negative)
int __CtrlReadSingleBuffer(PSPPointer<_ctrl_data> data, bool negative)
{
PSPPointer<_ctrl_data> data;
data = ctrlDataPtr;
if (data.IsValid())
{
*data = ctrlBufs[ctrlBufRead];
@ -238,11 +236,10 @@ int __CtrlReadBuffer(u32 ctrlDataPtr, u32 nBufs, bool negative, bool peek)
ctrlBufRead = (ctrlBuf - availBufs + NUM_CTRL_BUFFERS) % NUM_CTRL_BUFFERS;
int done = 0;
PSPPointer<_ctrl_data> data;
data = ctrlDataPtr;
for (u32 i = 0; i < availBufs; ++i)
{
done += __CtrlReadSingleBuffer(ctrlDataPtr, negative);
ctrlDataPtr += sizeof(_ctrl_data);
}
done += __CtrlReadSingleBuffer(data++, negative);
if (peek)
ctrlBufRead = resetRead;
@ -268,7 +265,8 @@ retry:
if (wVal == 0)
goto retry;
u32 ctrlDataPtr = __KernelGetWaitValue(threadID, error);
PSPPointer<_ctrl_data> ctrlDataPtr;
ctrlDataPtr = __KernelGetWaitValue(threadID, error);
int retVal = __CtrlReadSingleBuffer(ctrlDataPtr, wVal == CTRL_WAIT_NEGATIVE);
__KernelResumeThreadFromWait(threadID, retVal);
}

6
Core/HLE/sceDisplay.cpp
View file

@ -501,9 +501,6 @@ void hleEnterVblank(u64 userdata, int cyclesLate) {
}
frameStartTicks = CoreTiming::GetTicks();
// Fire the vblank listeners before we wake threads.
__DisplayFireVblank();
// Wake up threads waiting for VBlank
u32 error;
for (size_t i = 0; i < vblankWaitingThreads.size(); i++) {
@ -588,6 +585,9 @@ void hleLeaveVblank(u64 userdata, int cyclesLate) {
isVblank = 0;
DEBUG_LOG(SCEDISPLAY,"Leave VBlank %i", (int)userdata - 1);
CoreTiming::ScheduleEvent(msToCycles(frameMs - vblankMs) - cyclesLate, enterVblankEvent, userdata);
// Fire the vblank listeners after the vblank completes.
__DisplayFireVblank();
}
u32 sceDisplayIsVblank() {

3
GPU/Software/Rasterizer.cpp
View file

@ -353,9 +353,6 @@ static inline bool DepthTestPassed(int x, int y, u16 z)
{
u16 reference_z = GetPixelDepth(x, y);
if (gstate.isModeClear())
return true;
switch (gstate.getDepthTestFunction()) {
case GE_COMP_NEVER:
return false;