Rodolfo and Me fixed ProcessFifoWaitEvents() in CoreTiming, now process the all events and not only the first :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6513 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Marcos Vitali 2010-12-03 23:12:27 +00:00
parent 63d690e94c
commit f5a28aecb7
2 changed files with 26 additions and 11 deletions

View File

@ -400,22 +400,37 @@ void ProcessFifoWaitEvents()
{
MoveEvents();
while (first)
if (!first)
return;
if (first->time <= globalTimer && first->fifoWait)
{
if ((first->time <= globalTimer) && first->fifoWait)
{
Event* evt = first;
first = first->next;
event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time));
FreeEvent(evt);
Event *next = first->next;
event_types[first->type].callback(first->userdata, (int)(globalTimer - first->time));
FreeEvent(first);
first = next;
}
if (!first)
return;
Event *prev = first;
Event *ptr = prev->next;
while (ptr)
{
if (ptr->time <= globalTimer && ptr->fifoWait)
{
prev->next = ptr->next;
event_types[ptr->type].callback(ptr->userdata, (int)(globalTimer - ptr->time));
FreeEvent(ptr);
ptr = prev->next;
}
else
{
break;
prev = ptr;
ptr = ptr->next;
}
}
}
void MoveEvents()

View File

@ -57,7 +57,7 @@ void UnregisterAllEvents();
// userdata MAY NOT CONTAIN POINTERS. userdata might get written and reloaded from disk,
// when we implement state saves.
void ScheduleEvent(int cyclesIntoFuture, int event_type, u64 userdata=0);
void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata=0, bool fifoWait=false);
void ScheduleEvent_Threadsafe(int cyclesIntoFuture, int event_type, u64 userdata=0, bool fifoWait=true);
void ScheduleEvent_Threadsafe_Immediate(int event_type, u64 userdata=0);
// We only permit one event of each type in the queue at a time.