OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-14 22:50:06 +00:00
Code Issues Projects Releases Wiki Activity

y2r: Delay completion event

Browse Source
This commit is contained in:
GPUCode 2024-03-03 01:43:28 +02:00
parent 69e758d738
commit a17ada2b2a
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/hle/service/cam/y2r_u.cpp
View File

@ -522,7 +522,13 @@ void Y2R_U::StartConversion(Kernel::HLERequestContext& ctx) {
HW::Y2R::PerformConversion(system.Memory(), conversion); HW::Y2R::PerformConversion(system.Memory(), conversion);
completion_event->Signal(); if (is_busy_conversion) {
system.CoreTiming().RemoveEvent(completion_signal_event);
}
static constexpr s64 MinY2RDelay = 20000;
system.CoreTiming().ScheduleEvent(MinY2RDelay, completion_signal_event);
is_busy_conversion = true;
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
@ -533,6 +539,10 @@ void Y2R_U::StartConversion(Kernel::HLERequestContext& ctx) {
void Y2R_U::StopConversion(Kernel::HLERequestContext& ctx) { void Y2R_U::StopConversion(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp(ctx); IPC::RequestParser rp(ctx);
if (is_busy_conversion) {
system.CoreTiming().RemoveEvent(completion_signal_event);
}
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
@ -544,7 +554,7 @@ void Y2R_U::IsBusyConversion(Kernel::HLERequestContext& ctx) {
IPC::RequestBuilder rb = rp.MakeBuilder(2, 0); IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.Push<u8>(0); // StartConversion always finishes immediately rb.Push(is_busy_conversion);
LOG_DEBUG(Service_Y2R, "called"); LOG_DEBUG(Service_Y2R, "called");
} }
@ -697,6 +707,11 @@ Y2R_U::Y2R_U(Core::System& system) : ServiceFramework("y2r:u", 1), system(system
RegisterHandlers(functions); RegisterHandlers(functions);
completion_event = system.Kernel().CreateEvent(Kernel::ResetType::OneShot, "Y2R:Completed"); completion_event = system.Kernel().CreateEvent(Kernel::ResetType::OneShot, "Y2R:Completed");
completion_signal_event =
system.CoreTiming().RegisterEvent("Y2R Completion Signal Event", [this](uintptr_t, s64) {
completion_event->Signal();
is_busy_conversion = false;
});
} }
Y2R_U::~Y2R_U() = default; Y2R_U::~Y2R_U() = default;

2
src/core/hle/service/cam/y2r_u.h
View File

@ -349,11 +349,13 @@ private:
Core::System& system; Core::System& system;
std::shared_ptr<Kernel::Event> completion_event; std::shared_ptr<Kernel::Event> completion_event;
Core::TimingEventType* completion_signal_event;
ConversionConfiguration conversion{}; ConversionConfiguration conversion{};
DitheringWeightParams dithering_weight_params{}; DitheringWeightParams dithering_weight_params{};
bool temporal_dithering_enabled = false; bool temporal_dithering_enabled = false;
bool transfer_end_interrupt_enabled = false; bool transfer_end_interrupt_enabled = false;
bool spacial_dithering_enabled = false; bool spacial_dithering_enabled = false;
bool is_busy_conversion = false;
template <class Archive> template <class Archive>
void serialize(Archive& ar, const unsigned int); void serialize(Archive& ar, const unsigned int);