dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-04-02 19:08:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into gr2fix

Browse Source
This commit is contained in:
Valdis Bogdāns 2026-02-14 02:28:51 +02:00 committed by GitHub
commit a88dc03cc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/libraries/kernel/equeue.cpp
View File

@ -32,6 +32,14 @@ bool EqueueInternal::AddEvent(EqueueEvent& event) {
event.timer_interval = std::chrono::microseconds(event.event.data - offset);
}
// Remove add flag from event
event.event.flags &= ~SceKernelEvent::Flags::Add;
// Clear flag is appended to most event types internally.
if (event.event.filter != SceKernelEvent::Filter::User) {
event.event.flags |= SceKernelEvent::Flags::Clear;
}
const auto& it = std::ranges::find(m_events, event);
if (it != m_events.cend()) {
*it = std::move(event);
@ -165,10 +173,6 @@ int EqueueInternal::GetTriggeredEvents(SceKernelEvent* ev, int num) {
for (auto it = m_events.begin(); it != m_events.end();) {
if (it->IsTriggered()) {
ev[count++] = it->event;
// Event should not trigger again
it->ResetTriggerState();
if (it->event.flags & SceKernelEvent::Flags::Clear) {
it->Clear();
}

5
src/core/libraries/kernel/equeue.h
View File

@ -84,11 +84,8 @@ struct EqueueEvent {
std::chrono::microseconds timer_interval;
std::unique_ptr<boost::asio::steady_timer> timer;
void ResetTriggerState() {
is_triggered = false;
}
void Clear() {
is_triggered = false;
event.fflags = 0;
event.data = 0;
}