VERY experimental Nintendo Switch 2 emulator
C++
nvnflinger: check for layers before compose
Liamd082a80d79a3
diff --git a/src/core/hle/service/nvnflinger/display.h b/src/core/hle/service/nvnflinger/display.hindex 8a1956fe0a..f27cbf1446 100644--- a/src/core/hle/service/nvnflinger/display.h+++ b/src/core/hle/service/nvnflinger/display.h@@ -44,6 +44,10 @@ struct Display {return nullptr;}+ bool HasLayers() {+ return !stack.layers.empty();+ }+u64 id;LayerStack stack;};diff --git a/src/core/hle/service/nvnflinger/surface_flinger.cpp b/src/core/hle/service/nvnflinger/surface_flinger.cppindex 0e9714a03e..41a7057172 100644--- a/src/core/hle/service/nvnflinger/surface_flinger.cpp+++ b/src/core/hle/service/nvnflinger/surface_flinger.cpp@@ -33,16 +33,17 @@ void SurfaceFlinger::RemoveDisplay(u64 display_id) {std::erase_if(m_displays, [&](auto& display) { return display.id == display_id; });}-void SurfaceFlinger::ComposeDisplay(s32* out_swap_interval, f32* out_compose_speed_scale,+bool SurfaceFlinger::ComposeDisplay(s32* out_swap_interval, f32* out_compose_speed_scale,u64 display_id) {auto* const display = this->FindDisplay(display_id);- if (!display) {- return;+ if (!display || !display->HasLayers()) {+ return false;}*out_swap_interval =m_composer.ComposeLocked(out_compose_speed_scale, *display,*nvdrv->GetDevice<Nvidia::Devices::nvdisp_disp0>(disp_fd));+ return true;}void SurfaceFlinger::AddLayerToDisplayStack(u64 display_id, s32 consumer_binder_id) {diff --git a/src/core/hle/service/nvnflinger/surface_flinger.h b/src/core/hle/service/nvnflinger/surface_flinger.hindex a2e6614306..d8c53fbdae 100644--- a/src/core/hle/service/nvnflinger/surface_flinger.h+++ b/src/core/hle/service/nvnflinger/surface_flinger.h@@ -34,7 +34,7 @@ public:void AddDisplay(u64 display_id);void RemoveDisplay(u64 display_id);- void ComposeDisplay(s32* out_swap_interval, f32* out_compose_speed_scale, u64 display_id);+ bool ComposeDisplay(s32* out_swap_interval, f32* out_compose_speed_scale, u64 display_id);void AddLayerToDisplayStack(u64 display_id, s32 consumer_binder_id);void RemoveLayerFromDisplayStack(u64 display_id, s32 consumer_binder_id);diff --git a/src/core/hle/service/vi/container.cpp b/src/core/hle/service/vi/container.cppindex 2d6b9cbfee..310a207f10 100644--- a/src/core/hle/service/vi/container.cpp+++ b/src/core/hle/service/vi/container.cpp@@ -218,10 +218,11 @@ void Container::DestroyBufferQueueLocked(Layer* layer) {layer->GetProducerBinderId());}-void Container::ComposeOnDisplay(s32* out_swap_interval, f32* out_compose_speed_scale,+bool Container::ComposeOnDisplay(s32* out_swap_interval, f32* out_compose_speed_scale,u64 display_id) {std::scoped_lock lk{m_lock};- m_surface_flinger->ComposeDisplay(out_swap_interval, out_compose_speed_scale, display_id);+ return m_surface_flinger->ComposeDisplay(out_swap_interval, out_compose_speed_scale,+ display_id);}} // namespace Service::VIdiff --git a/src/core/hle/service/vi/container.h b/src/core/hle/service/vi/container.hindex 155c4c629e..cd0d2ca86f 100644--- a/src/core/hle/service/vi/container.h+++ b/src/core/hle/service/vi/container.h@@ -76,7 +76,7 @@ private:void DestroyBufferQueueLocked(Layer* layer);public:- void ComposeOnDisplay(s32* out_swap_interval, f32* out_compose_speed_scale, u64 display_id);+ bool ComposeOnDisplay(s32* out_swap_interval, f32* out_compose_speed_scale, u64 display_id);private:std::mutex m_lock{};