mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-07-26 03:55:37 +00:00
clean up
This commit is contained in:
parent
528f7a29f4
commit
58362dba98
@ -311,10 +311,9 @@ void VideoOutDriver::PresentThread(std::stop_token token) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Flip(request);
|
Flip(request);
|
||||||
request.port->vo_cv.notify_all();
|
request.port->vo_cv.notify_all(); // wake up threads waiting to submit more flips
|
||||||
// wake up threads waiting to submit more flips
|
FRAME_END;
|
||||||
}
|
}
|
||||||
FRAME_END;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -29,8 +29,6 @@ struct VideoOutPort {
|
|||||||
std::vector<Kernel::SceKernelEqueue> vblank_events;
|
std::vector<Kernel::SceKernelEqueue> vblank_events;
|
||||||
std::mutex vo_mutex;
|
std::mutex vo_mutex;
|
||||||
std::mutex port_mutex;
|
std::mutex port_mutex;
|
||||||
std::mutex pending_mutex;
|
|
||||||
std::queue<std::tuple<u32, u32>> pending_flips;
|
|
||||||
std::condition_variable vo_cv;
|
std::condition_variable vo_cv;
|
||||||
std::condition_variable vblank_cv;
|
std::condition_variable vblank_cv;
|
||||||
int flip_rate = 0;
|
int flip_rate = 0;
|
||||||
|
@ -338,11 +338,6 @@ s32 sceVideoOutSubmitEopFlip(s32 handle, u32 buf_id, u32 mode, u32 arg, void** u
|
|||||||
if (!port) {
|
if (!port) {
|
||||||
return ORBIS_VIDEO_OUT_ERROR_INVALID_HANDLE;
|
return ORBIS_VIDEO_OUT_ERROR_INVALID_HANDLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
|
||||||
std::lock_guard lock(port->pending_mutex);
|
|
||||||
port->pending_flips.emplace(buf_id, arg);
|
|
||||||
}
|
|
||||||
Platform::IrqC::Instance()->RegisterOnce(
|
Platform::IrqC::Instance()->RegisterOnce(
|
||||||
Platform::InterruptId::GfxFlip, [=](Platform::InterruptId irq) {
|
Platform::InterruptId::GfxFlip, [=](Platform::InterruptId irq) {
|
||||||
ASSERT_MSG(irq == Platform::InterruptId::GfxFlip, "Unexpected IRQ");
|
ASSERT_MSG(irq == Platform::InterruptId::GfxFlip, "Unexpected IRQ");
|
||||||
|
Loading…
Reference in New Issue
Block a user