catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed return in flip() function

This commit is contained in:
georgemoralis 2023-10-29 23:36:15 +02:00
parent adbe725d79
commit 1e755d3cfc
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp
View File

@ -30,15 +30,14 @@ int VideoOutCtx::Open() {
return handle; return handle;
} }
void VideoOutCtx::Close(s32 handle) { void VideoOutCtx::Close(s32 handle) {
std::scoped_lock lock{m_mutex}; std::scoped_lock lock{m_mutex};
m_video_out_ctx.isOpened = false; m_video_out_ctx.isOpened = false;
if (m_video_out_ctx.m_flip_evtEq.size() > 0) if (m_video_out_ctx.m_flip_evtEq.size() > 0) {
{ BREAKPOINT(); // we need to clear all events if they have been created
BREAKPOINT(); //we need to clear all events if they have been created
} }
m_video_out_ctx.m_flip_rate = 0; m_video_out_ctx.m_flip_rate = 0;
// clear buffers // clear buffers
@ -89,22 +88,21 @@ bool FlipQueue::submitFlip(VideoConfigInternal* cfg, s32 index, s64 flip_arg) {
return true; return true;
} }
bool FlipQueue::flip(u32 micros) { bool FlipQueue::flip(u32 micros) {
const auto request = [&]() -> Request* { const auto request = [&]() -> Request* {
std::unique_lock lock{m_mutex}; std::unique_lock lock{m_mutex};
m_submit_cond.wait_for(lock, std::chrono::microseconds(micros), m_submit_cond.wait_for(lock, std::chrono::microseconds(micros), [&] { return !m_requests.empty(); });
[&] { return !m_requests.empty(); });
if (m_requests.empty()) { if (m_requests.empty()) {
return nullptr; return nullptr;
} }
return &m_requests.at(0); // Process first request return &m_requests.at(0); // Process first request
}(); }();
if (!request) { if (!request) {
return false; return false;
} }
const auto buffer = request->cfg->buffers[request->index].buffer_render; const auto buffer = request->cfg->buffers[request->index].buffer_render;
Emu::DrawBuffer(buffer); Emu::DrawBuffer(buffer);
std::scoped_lock lock{m_mutex}; std::scoped_lock lock{m_mutex};
@ -113,8 +111,7 @@ bool FlipQueue::flip(u32 micros) {
std::scoped_lock cfg_lock{request->cfg->m_mutex}; std::scoped_lock cfg_lock{request->cfg->m_mutex};
for (auto& flip_eq : request->cfg->m_flip_evtEq) { for (auto& flip_eq : request->cfg->m_flip_evtEq) {
if (flip_eq != nullptr) { if (flip_eq != nullptr) {
flip_eq->triggerEvent(SCE_VIDEO_OUT_EVENT_FLIP, HLE::Kernel::Objects::EVFILT_VIDEO_OUT, flip_eq->triggerEvent(SCE_VIDEO_OUT_EVENT_FLIP, HLE::Kernel::Objects::EVFILT_VIDEO_OUT, reinterpret_cast<void*>(request->flip_arg));
reinterpret_cast<void*>(request->flip_arg));
} }
} }
} }
@ -123,14 +120,14 @@ bool FlipQueue::flip(u32 micros) {
m_done_cond.notify_one(); m_done_cond.notify_one();
request->cfg->m_flip_status.count++; request->cfg->m_flip_status.count++;
//TODO request.cfg->m_flip_status.processTime = LibKernel::KernelGetProcessTime(); // TODO request.cfg->m_flip_status.processTime = LibKernel::KernelGetProcessTime();
request->cfg->m_flip_status.tsc = HLE::Libs::LibKernel::sceKernelReadTsc(); request->cfg->m_flip_status.tsc = HLE::Libs::LibKernel::sceKernelReadTsc();
request->cfg->m_flip_status.submitTsc = request->submit_tsc; request->cfg->m_flip_status.submitTsc = request->submit_tsc;
request->cfg->m_flip_status.flipArg = request->flip_arg; request->cfg->m_flip_status.flipArg = request->flip_arg;
request->cfg->m_flip_status.currentBuffer = request->index; request->cfg->m_flip_status.currentBuffer = request->index;
request->cfg->m_flip_status.flipPendingNum = static_cast<int>(m_requests.size()); request->cfg->m_flip_status.flipPendingNum = static_cast<int>(m_requests.size());
return false; return true;
} }
}; // namespace HLE::Graphics::Objects }; // namespace HLE::Graphics::Objects