VERY experimental Nintendo Switch 2 emulator
C++
vi: move shared buffer management from nvnflinger
Liame34074861c22
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex f598bd6348..bf1268bbbe 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -798,8 +798,6 @@ add_library(core STATIChle/service/nvnflinger/consumer_base.cpphle/service/nvnflinger/consumer_base.hhle/service/nvnflinger/consumer_listener.h- hle/service/nvnflinger/fb_share_buffer_manager.cpp- hle/service/nvnflinger/fb_share_buffer_manager.hhle/service/nvnflinger/graphic_buffer_producer.cpphle/service/nvnflinger/graphic_buffer_producer.hhle/service/nvnflinger/hos_binder_driver_server.cpp@@ -963,6 +961,8 @@ add_library(core STATIChle/service/vi/application_display_service.hhle/service/vi/application_root_service.cpphle/service/vi/application_root_service.h+ hle/service/vi/fbshare_buffer_manager.cpp+ hle/service/vi/fbshare_buffer_manager.hhle/service/vi/manager_display_service.cpphle/service/vi/manager_display_service.hhle/service/vi/manager_root_service.cppdiff --git a/src/core/hle/service/am/display_layer_manager.cpp b/src/core/hle/service/am/display_layer_manager.cppindex 6cf3c369c3..dc742c1f66 100644--- a/src/core/hle/service/am/display_layer_manager.cpp+++ b/src/core/hle/service/am/display_layer_manager.cpp@@ -3,11 +3,13 @@#include "core/core.h"#include "core/hle/service/am/display_layer_manager.h"-#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h"#include "core/hle/service/nvnflinger/hos_binder_driver.h"-#include "core/hle/service/nvnflinger/nvnflinger.h"#include "core/hle/service/sm/sm.h"+#include "core/hle/service/vi/application_display_service.h"+#include "core/hle/service/vi/fbshare_buffer_manager.h"+#include "core/hle/service/vi/manager_root_service.h"#include "core/hle/service/vi/vi_results.h"+#include "core/hle/service/vi/vi_types.h"namespace Service::AM {@@ -18,10 +20,14 @@ DisplayLayerManager::~DisplayLayerManager() {void DisplayLayerManager::Initialize(Core::System& system, Kernel::KProcess* process,AppletId applet_id, LibraryAppletMode mode) {- m_process = process;m_surface_flinger = system.ServiceManager().GetService<Nvnflinger::IHOSBinderDriver>("dispdrv", true)->GetSurfaceFlinger();+ R_ASSERT(system.ServiceManager()+ .GetService<VI::IManagerRootService>("vi:m", true)+ ->GetDisplayService(&m_display_service, VI::Policy::Compositor));++ m_process = process;m_system_shared_buffer_id = 0;m_system_shared_layer_id = 0;m_applet_id = applet_id;@@ -46,7 +52,7 @@ void DisplayLayerManager::Finalize() {// Clean up shared layers.if (m_buffer_sharing_enabled) {- m_surface_flinger->GetSystemBufferManager().Finalize(m_process);+ m_display_service->GetSharedBufferManager()->Finalize(m_process);}m_surface_flinger = nullptr;@@ -103,7 +109,7 @@ Result DisplayLayerManager::IsSystemBufferSharingEnabled() {const auto blend =m_blending_enabled ? Nvnflinger::LayerBlending::Coverage : Nvnflinger::LayerBlending::None;const auto display_id = m_surface_flinger->OpenDisplay("Default").value();- R_TRY(m_surface_flinger->GetSystemBufferManager().Initialize(+ R_TRY(m_display_service->GetSharedBufferManager()->Initialize(m_process, &m_system_shared_buffer_id, &m_system_shared_layer_id, display_id, blend));// We succeeded, so set up remaining state.@@ -147,7 +153,7 @@ bool DisplayLayerManager::GetWindowVisibility() const {Result DisplayLayerManager::WriteAppletCaptureBuffer(bool* out_was_written,s32* out_fbshare_layer_index) {R_UNLESS(m_buffer_sharing_enabled, VI::ResultPermissionDenied);- R_RETURN(m_surface_flinger->GetSystemBufferManager().WriteAppletCaptureBuffer(+ R_RETURN(m_display_service->GetSharedBufferManager()->WriteAppletCaptureBuffer(out_was_written, out_fbshare_layer_index));}diff --git a/src/core/hle/service/am/display_layer_manager.h b/src/core/hle/service/am/display_layer_manager.hindex 92ab9399fa..7591b0e605 100644--- a/src/core/hle/service/am/display_layer_manager.h+++ b/src/core/hle/service/am/display_layer_manager.h@@ -21,6 +21,10 @@ namespace Service::Nvnflinger {class Nvnflinger;}+namespace Service::VI {+class IApplicationDisplayService;+}+namespace Service::AM {class DisplayLayerManager {@@ -47,6 +51,7 @@ public:private:Kernel::KProcess* m_process{};std::shared_ptr<Nvnflinger::Nvnflinger> m_surface_flinger{};+ std::shared_ptr<VI::IApplicationDisplayService> m_display_service{};std::set<u64> m_managed_display_layers{};std::set<u64> m_managed_display_recording_layers{};u64 m_system_shared_buffer_id{};diff --git a/src/core/hle/service/nvnflinger/nvnflinger.cpp b/src/core/hle/service/nvnflinger/nvnflinger.cppindex cd8062a2b6..a20ef14af9 100644--- a/src/core/hle/service/nvnflinger/nvnflinger.cpp+++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp@@ -9,7 +9,6 @@#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"#include "core/hle/service/nvdrv/nvdrv.h"#include "core/hle/service/nvdrv/nvdrv_interface.h"-#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h"#include "core/hle/service/nvnflinger/hardware_composer.h"#include "core/hle/service/nvnflinger/hos_binder_driver.h"#include "core/hle/service/nvnflinger/hos_binder_driver_server.h"@@ -311,16 +310,6 @@ s64 Nvnflinger::GetNextTicks() const {return static_cast<s64>(speed_scale * (1000000000.f / effective_fps));}-FbShareBufferManager& Nvnflinger::GetSystemBufferManager() {- const auto lock_guard = Lock();-- if (!system_buffer_manager) {- system_buffer_manager = std::make_unique<FbShareBufferManager>(system, *this, nvdrv);- }-- return *system_buffer_manager;-}-void LoopProcess(Core::System& system) {const auto binder_server = std::make_shared<HosBinderDriverServer>(system);const auto surface_flinger = std::make_shared<Nvnflinger>(system, *binder_server);diff --git a/src/core/hle/service/nvnflinger/nvnflinger.h b/src/core/hle/service/nvnflinger/nvnflinger.hindex 5ed7dc3171..941a98418e 100644--- a/src/core/hle/service/nvnflinger/nvnflinger.h+++ b/src/core/hle/service/nvnflinger/nvnflinger.h@@ -35,6 +35,7 @@ class Module;namespace Service::VI {class Display;+class FbshareBufferManager;class Layer;} // namespace Service::VI@@ -45,7 +46,6 @@ class BufferQueueProducer;namespace Service::Nvnflinger {-class FbShareBufferManager;class HardwareComposer;class HosBinderDriverServer;@@ -101,17 +101,9 @@ public:[[nodiscard]] s64 GetNextTicks() const;- FbShareBufferManager& GetSystemBufferManager();-private:- struct Layer {- std::unique_ptr<android::BufferQueueCore> core;- std::unique_ptr<android::BufferQueueProducer> producer;- };-- friend class FbShareBufferManager;+ friend class VI::FbshareBufferManager;-private:[[nodiscard]] std::unique_lock<std::mutex> Lock() const {return std::unique_lock{*guard};}@@ -150,8 +142,6 @@ private:std::shared_ptr<Core::Timing::EventType> multi_composition_event;std::shared_ptr<Core::Timing::EventType> single_composition_event;- std::unique_ptr<FbShareBufferManager> system_buffer_manager;-std::shared_ptr<std::mutex> guard;Core::System& system;diff --git a/src/core/hle/service/vi/application_display_service.cpp b/src/core/hle/service/vi/application_display_service.cppindex a6e04bf602..9c009f9028 100644--- a/src/core/hle/service/vi/application_display_service.cpp+++ b/src/core/hle/service/vi/application_display_service.cpp@@ -13,10 +13,12 @@namespace Service::VI {IApplicationDisplayService::IApplicationDisplayService(- Core::System& system_, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service)+ Core::System& system_, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager): ServiceFramework{system_, "IApplicationDisplayService"},m_binder_service{std::move(binder_service)},- m_surface_flinger{m_binder_service->GetSurfaceFlinger()} {+ m_surface_flinger{m_binder_service->GetSurfaceFlinger()},+ m_shared_buffer_manager{std::move(shared_buffer_manager)} {// clang-format offstatic const FunctionInfo functions[] = {@@ -64,7 +66,7 @@ Result IApplicationDisplayService::GetSystemDisplayService(Out<SharedPointer<ISystemDisplayService>> out_system_display_service) {LOG_WARNING(Service_VI, "(STUBBED) called");*out_system_display_service =- std::make_shared<ISystemDisplayService>(system, m_surface_flinger);+ std::make_shared<ISystemDisplayService>(system, m_surface_flinger, m_shared_buffer_manager);R_SUCCEED();}diff --git a/src/core/hle/service/vi/application_display_service.h b/src/core/hle/service/vi/application_display_service.hindex e56490f9fa..5022b2f636 100644--- a/src/core/hle/service/vi/application_display_service.h+++ b/src/core/hle/service/vi/application_display_service.h@@ -16,15 +16,21 @@ class IHOSBinderDriver;namespace Service::VI {+class FbshareBufferManager;class IManagerDisplayService;class ISystemDisplayService;class IApplicationDisplayService final : public ServiceFramework<IApplicationDisplayService> {public:IApplicationDisplayService(Core::System& system_,- std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service);+ std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager);~IApplicationDisplayService() override;+ std::shared_ptr<FbshareBufferManager> GetSharedBufferManager() const {+ return m_shared_buffer_manager;+ }+private:Result GetRelayService(Out<SharedPointer<Nvnflinger::IHOSBinderDriver>> out_relay_service);Result GetSystemDisplayService(@@ -62,6 +68,7 @@ private:private:const std::shared_ptr<Nvnflinger::IHOSBinderDriver> m_binder_service;const std::shared_ptr<Nvnflinger::Nvnflinger> m_surface_flinger;+ const std::shared_ptr<FbshareBufferManager> m_shared_buffer_manager;std::vector<u64> m_stray_layer_ids;bool m_vsync_event_fetched{false};};diff --git a/src/core/hle/service/vi/application_root_service.cpp b/src/core/hle/service/vi/application_root_service.cppindex 501fbdd6aa..ed8c9b1b30 100644--- a/src/core/hle/service/vi/application_root_service.cpp+++ b/src/core/hle/service/vi/application_root_service.cpp@@ -11,8 +11,10 @@namespace Service::VI {IApplicationRootService::IApplicationRootService(- Core::System& system_, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service)- : ServiceFramework{system_, "vi:u"}, m_binder_service{std::move(binder_service)} {+ Core::System& system_, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager)+ : ServiceFramework{system_, "vi:u"}, m_binder_service{std::move(binder_service)},+ m_shared_buffer_manager{std::move(shared_buffer_manager)} {static const FunctionInfo functions[] = {{0, C<&IApplicationRootService::GetDisplayService>, "GetDisplayService"},{1, nullptr, "GetDisplayServiceWithProxyNameExchange"},@@ -26,7 +28,7 @@ Result IApplicationRootService::GetDisplayService(Out<SharedPointer<IApplicationDisplayService>> out_application_display_service, Policy policy) {LOG_DEBUG(Service_VI, "called");R_RETURN(GetApplicationDisplayService(out_application_display_service, system, m_binder_service,- Permission::User, policy));+ m_shared_buffer_manager, Permission::User, policy));}} // namespace Service::VIdiff --git a/src/core/hle/service/vi/application_root_service.h b/src/core/hle/service/vi/application_root_service.hindex d1f023e9ec..5970b6e681 100644--- a/src/core/hle/service/vi/application_root_service.h+++ b/src/core/hle/service/vi/application_root_service.h@@ -16,13 +16,15 @@ class IHOSBinderDriver;namespace Service::VI {+class FbshareBufferManager;class IApplicationDisplayService;enum class Policy : u32;class IApplicationRootService final : public ServiceFramework<IApplicationRootService> {public:explicit IApplicationRootService(Core::System& system_,- std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service);+ std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager);~IApplicationRootService() override;private:@@ -32,6 +34,7 @@ private:private:const std::shared_ptr<Nvnflinger::IHOSBinderDriver> m_binder_service;+ const std::shared_ptr<FbshareBufferManager> m_shared_buffer_manager;};} // namespace Service::VIdiff --git a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp b/src/core/hle/service/vi/fbshare_buffer_manager.cppsimilarity index 91%rename from src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpprename to src/core/hle/service/vi/fbshare_buffer_manager.cppindex 90f7248a02..e61c02e1c7 100644--- a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp+++ b/src/core/hle/service/vi/fbshare_buffer_manager.cpp@@ -9,15 +9,15 @@#include "core/hle/service/nvdrv/devices/nvmap.h"#include "core/hle/service/nvdrv/nvdrv.h"#include "core/hle/service/nvnflinger/buffer_queue_producer.h"-#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h"#include "core/hle/service/nvnflinger/pixel_format.h"#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"+#include "core/hle/service/vi/fbshare_buffer_manager.h"#include "core/hle/service/vi/layer/vi_layer.h"#include "core/hle/service/vi/vi_results.h"#include "video_core/gpu.h"#include "video_core/host1x/host1x.h"-namespace Service::Nvnflinger {+namespace Service::VI {namespace {@@ -26,7 +26,6 @@ Result AllocateSharedBufferMemory(std::unique_ptr<Kernel::KPageGroup>* out_page_using Core::Memory::YUZU_PAGESIZE;// Allocate memory for the system shared buffer.- // FIXME: This memory belongs to vi's .data section.auto& kernel = system.Kernel();// Hold a temporary page group reference while we try to map it.@@ -204,15 +203,16 @@ void MakeGraphicBuffer(android::BufferQueueProducer& producer, u32 slot, u32 han} // namespace-FbShareBufferManager::FbShareBufferManager(Core::System& system, Nvnflinger& flinger,+FbshareBufferManager::FbshareBufferManager(Core::System& system,+ std::shared_ptr<Nvnflinger::Nvnflinger> surface_flinger,std::shared_ptr<Nvidia::Module> nvdrv)- : m_system(system), m_flinger(flinger), m_nvdrv(std::move(nvdrv)) {}+ : m_system(system), m_surface_flinger(std::move(surface_flinger)), m_nvdrv(std::move(nvdrv)) {}-FbShareBufferManager::~FbShareBufferManager() = default;+FbshareBufferManager::~FbshareBufferManager() = default;-Result FbShareBufferManager::Initialize(Kernel::KProcess* owner_process, u64* out_buffer_id,+Result FbshareBufferManager::Initialize(Kernel::KProcess* owner_process, u64* out_buffer_id,u64* out_layer_handle, u64 display_id,- LayerBlending blending) {+ Nvnflinger::LayerBlending blending) {std::scoped_lock lk{m_guard};// Ensure we haven't already created.@@ -237,7 +237,7 @@ Result FbShareBufferManager::Initialize(Kernel::KProcess* owner_process, u64* ouowner_process, m_system));// Create new session.- auto [it, was_emplaced] = m_sessions.emplace(aruid, FbShareSession{});+ auto [it, was_emplaced] = m_sessions.emplace(aruid, FbshareSession{});auto& session = it->second;auto& container = m_nvdrv->GetContainer();@@ -249,11 +249,11 @@ Result FbShareBufferManager::Initialize(Kernel::KProcess* owner_process, u64* ousession.nvmap_fd, map_address, SharedBufferSize));// Create and open a layer for the display.- session.layer_id = m_flinger.CreateLayer(m_display_id, blending).value();- m_flinger.OpenLayer(session.layer_id);+ session.layer_id = m_surface_flinger->CreateLayer(m_display_id, blending).value();+ m_surface_flinger->OpenLayer(session.layer_id);// Get the layer.- VI::Layer* layer = m_flinger.FindLayer(m_display_id, session.layer_id);+ VI::Layer* layer = m_surface_flinger->FindLayer(m_display_id, session.layer_id);ASSERT(layer != nullptr);// Get the producer and set preallocated buffers.@@ -269,7 +269,7 @@ Result FbShareBufferManager::Initialize(Kernel::KProcess* owner_process, u64* ouR_SUCCEED();}-void FbShareBufferManager::Finalize(Kernel::KProcess* owner_process) {+void FbshareBufferManager::Finalize(Kernel::KProcess* owner_process) {std::scoped_lock lk{m_guard};if (m_buffer_id == 0) {@@ -285,7 +285,7 @@ void FbShareBufferManager::Finalize(Kernel::KProcess* owner_process) {auto& session = it->second;// Destroy the layer.- m_flinger.DestroyLayer(session.layer_id);+ m_surface_flinger->DestroyLayer(session.layer_id);// Close nvmap handle.FreeHandle(session.buffer_nvmap_handle, *m_nvdrv, session.nvmap_fd);@@ -301,7 +301,7 @@ void FbShareBufferManager::Finalize(Kernel::KProcess* owner_process) {m_sessions.erase(it);}-Result FbShareBufferManager::GetSharedBufferMemoryHandleId(u64* out_buffer_size,+Result FbshareBufferManager::GetSharedBufferMemoryHandleId(u64* out_buffer_size,s32* out_nvmap_handle,SharedMemoryPoolLayout* out_pool_layout,u64 buffer_id,@@ -319,12 +319,12 @@ Result FbShareBufferManager::GetSharedBufferMemoryHandleId(u64* out_buffer_size,R_SUCCEED();}-Result FbShareBufferManager::GetLayerFromId(VI::Layer** out_layer, u64 layer_id) {+Result FbshareBufferManager::GetLayerFromId(VI::Layer** out_layer, u64 layer_id) {// Ensure the layer id is valid.R_UNLESS(layer_id > 0, VI::ResultNotFound);// Get the layer.- VI::Layer* layer = m_flinger.FindLayer(m_display_id, layer_id);+ VI::Layer* layer = m_surface_flinger->FindLayer(m_display_id, layer_id);R_UNLESS(layer != nullptr, VI::ResultNotFound);// We succeeded.@@ -332,7 +332,7 @@ Result FbShareBufferManager::GetLayerFromId(VI::Layer** out_layer, u64 layer_id)R_SUCCEED();}-Result FbShareBufferManager::AcquireSharedFrameBuffer(android::Fence* out_fence,+Result FbshareBufferManager::AcquireSharedFrameBuffer(android::Fence* out_fence,std::array<s32, 4>& out_slot_indexes,s64* out_target_slot, u64 layer_id) {std::scoped_lock lk{m_guard};@@ -359,7 +359,7 @@ Result FbShareBufferManager::AcquireSharedFrameBuffer(android::Fence* out_fence,R_SUCCEED();}-Result FbShareBufferManager::PresentSharedFrameBuffer(android::Fence fence,+Result FbshareBufferManager::PresentSharedFrameBuffer(android::Fence fence,Common::Rectangle<s32> crop_region,u32 transform, s32 swap_interval,u64 layer_id, s64 slot) {@@ -397,7 +397,7 @@ Result FbShareBufferManager::PresentSharedFrameBuffer(android::Fence fence,R_SUCCEED();}-Result FbShareBufferManager::GetSharedFrameBufferAcquirableEvent(Kernel::KReadableEvent** out_event,+Result FbshareBufferManager::GetSharedFrameBufferAcquirableEvent(Kernel::KReadableEvent** out_event,u64 layer_id) {std::scoped_lock lk{m_guard};@@ -415,7 +415,7 @@ Result FbShareBufferManager::GetSharedFrameBufferAcquirableEvent(Kernel::KReadabR_SUCCEED();}-Result FbShareBufferManager::WriteAppletCaptureBuffer(bool* out_was_written, s32* out_layer_index) {+Result FbshareBufferManager::WriteAppletCaptureBuffer(bool* out_was_written, s32* out_layer_index) {std::vector<u8> capture_buffer(m_system.GPU().GetAppletCaptureBuffer());Common::ScratchBuffer<u32> scratch;@@ -444,4 +444,4 @@ Result FbShareBufferManager::WriteAppletCaptureBuffer(bool* out_was_written, s32R_SUCCEED();}-} // namespace Service::Nvnflinger+} // namespace Service::VIdiff --git a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h b/src/core/hle/service/vi/fbshare_buffer_manager.hsimilarity index 80%rename from src/core/hle/service/nvnflinger/fb_share_buffer_manager.hrename to src/core/hle/service/vi/fbshare_buffer_manager.hindex b79a7d23ac..b9e99e61f1 100644--- a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h+++ b/src/core/hle/service/vi/fbshare_buffer_manager.h@@ -16,7 +16,7 @@ namespace Kernel {class KPageGroup;}-namespace Service::Nvnflinger {+namespace Service::VI {struct SharedMemorySlot {u64 buffer_offset;@@ -32,16 +32,17 @@ struct SharedMemoryPoolLayout {};static_assert(sizeof(SharedMemoryPoolLayout) == 0x188, "SharedMemoryPoolLayout has wrong size");-struct FbShareSession;+struct FbshareSession;-class FbShareBufferManager final {+class FbshareBufferManager final {public:- explicit FbShareBufferManager(Core::System& system, Nvnflinger& flinger,+ explicit FbshareBufferManager(Core::System& system,+ std::shared_ptr<Nvnflinger::Nvnflinger> surface_flinger,std::shared_ptr<Nvidia::Module> nvdrv);- ~FbShareBufferManager();+ ~FbshareBufferManager();Result Initialize(Kernel::KProcess* owner_process, u64* out_buffer_id, u64* out_layer_handle,- u64 display_id, LayerBlending blending);+ u64 display_id, Nvnflinger::LayerBlending blending);void Finalize(Kernel::KProcess* owner_process);Result GetSharedBufferMemoryHandleId(u64* out_buffer_size, s32* out_nvmap_handle,@@ -63,20 +64,20 @@ private:u64 m_display_id = 0;u64 m_buffer_id = 0;SharedMemoryPoolLayout m_pool_layout = {};- std::map<u64, FbShareSession> m_sessions;+ std::map<u64, FbshareSession> m_sessions;std::unique_ptr<Kernel::KPageGroup> m_buffer_page_group;std::mutex m_guard;Core::System& m_system;- Nvnflinger& m_flinger;- std::shared_ptr<Nvidia::Module> m_nvdrv;+ const std::shared_ptr<Nvnflinger::Nvnflinger> m_surface_flinger;+ const std::shared_ptr<Nvidia::Module> m_nvdrv;};-struct FbShareSession {+struct FbshareSession {Nvidia::DeviceFD nvmap_fd = {};Nvidia::NvCore::SessionId session_id = {};u64 layer_id = {};u32 buffer_nvmap_handle = 0;};-} // namespace Service::Nvnflinger+} // namespace Service::VIdiff --git a/src/core/hle/service/vi/manager_root_service.cpp b/src/core/hle/service/vi/manager_root_service.cppindex 36b84909a9..b61f0ecb6c 100644--- a/src/core/hle/service/vi/manager_root_service.cpp+++ b/src/core/hle/service/vi/manager_root_service.cpp@@ -2,6 +2,7 @@// SPDX-License-Identifier: GPL-2.0-or-later#include "core/hle/service/cmif_serialization.h"+#include "core/hle/service/nvnflinger/hos_binder_driver.h"#include "core/hle/service/vi/application_display_service.h"#include "core/hle/service/vi/manager_root_service.h"#include "core/hle/service/vi/service_creator.h"@@ -11,8 +12,10 @@namespace Service::VI {IManagerRootService::IManagerRootService(- Core::System& system_, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service)- : ServiceFramework{system_, "vi:m"}, m_binder_service{std::move(binder_service)} {+ Core::System& system_, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager)+ : ServiceFramework{system_, "vi:m"}, m_binder_service{std::move(binder_service)},+ m_shared_buffer_manager{std::move(shared_buffer_manager)} {static const FunctionInfo functions[] = {{2, C<&IManagerRootService::GetDisplayService>, "GetDisplayService"},{3, nullptr, "GetDisplayServiceWithProxyNameExchange"},@@ -30,7 +33,7 @@ Result IManagerRootService::GetDisplayService(Out<SharedPointer<IApplicationDisplayService>> out_application_display_service, Policy policy) {LOG_DEBUG(Service_VI, "called");R_RETURN(GetApplicationDisplayService(out_application_display_service, system, m_binder_service,- Permission::Manager, policy));+ m_shared_buffer_manager, Permission::Manager, policy));}} // namespace Service::VIdiff --git a/src/core/hle/service/vi/manager_root_service.h b/src/core/hle/service/vi/manager_root_service.hindex 26aa95a884..509445b7b6 100644--- a/src/core/hle/service/vi/manager_root_service.h+++ b/src/core/hle/service/vi/manager_root_service.h@@ -16,21 +16,24 @@ class IHOSBinderDriver;namespace Service::VI {+class FbshareBufferManager;class IApplicationDisplayService;enum class Policy : u32;class IManagerRootService final : public ServiceFramework<IManagerRootService> {public:explicit IManagerRootService(Core::System& system_,- std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service);+ std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager);~IManagerRootService() override;-private:Result GetDisplayService(Out<SharedPointer<IApplicationDisplayService>> out_application_display_service,Policy policy);+private:const std::shared_ptr<Nvnflinger::IHOSBinderDriver> m_binder_service;+ const std::shared_ptr<FbshareBufferManager> m_shared_buffer_manager;};} // namespace Service::VIdiff --git a/src/core/hle/service/vi/service_creator.cpp b/src/core/hle/service/vi/service_creator.cppindex 594e57398c..414bd66559 100644--- a/src/core/hle/service/vi/service_creator.cpp+++ b/src/core/hle/service/vi/service_creator.cpp@@ -23,7 +23,8 @@ static bool IsValidServiceAccess(Permission permission, Policy policy) {Result GetApplicationDisplayService(std::shared_ptr<IApplicationDisplayService>* out_application_display_service,Core::System& system, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,- Permission permission, Policy policy) {+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager, Permission permission,+ Policy policy) {if (!IsValidServiceAccess(permission, policy)) {LOG_ERROR(Service_VI, "Permission denied for policy {}", policy);@@ -31,7 +32,7 @@ Result GetApplicationDisplayService(}*out_application_display_service =- std::make_shared<IApplicationDisplayService>(system, binder_service);+ std::make_shared<IApplicationDisplayService>(system, binder_service, shared_buffer_manager);R_SUCCEED();}diff --git a/src/core/hle/service/vi/service_creator.h b/src/core/hle/service/vi/service_creator.hindex bdfac8a08b..6691f25c02 100644--- a/src/core/hle/service/vi/service_creator.h+++ b/src/core/hle/service/vi/service_creator.h@@ -19,6 +19,7 @@ union Result;namespace Service::VI {+class FbshareBufferManager;class IApplicationDisplayService;enum class Permission;enum class Policy : u32;@@ -26,6 +27,7 @@ enum class Policy : u32;Result GetApplicationDisplayService(std::shared_ptr<IApplicationDisplayService>* out_application_display_service,Core::System& system, std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,- Permission permission, Policy policy);+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager, Permission permission,+ Policy policy);} // namespace Service::VIdiff --git a/src/core/hle/service/vi/system_display_service.cpp b/src/core/hle/service/vi/system_display_service.cppindex 8d6c3f04c5..4670cf4cc0 100644--- a/src/core/hle/service/vi/system_display_service.cpp+++ b/src/core/hle/service/vi/system_display_service.cpp@@ -3,16 +3,17 @@#include "common/settings.h"#include "core/hle/service/cmif_serialization.h"-#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h"#include "core/hle/service/vi/system_display_service.h"#include "core/hle/service/vi/vi_types.h"namespace Service::VI {ISystemDisplayService::ISystemDisplayService(- Core::System& system_, std::shared_ptr<Nvnflinger::Nvnflinger> surface_flinger)+ Core::System& system_, std::shared_ptr<Nvnflinger::Nvnflinger> surface_flinger,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager): ServiceFramework{system_, "ISystemDisplayService"},- m_surface_flinger{std::move(surface_flinger)} {+ m_surface_flinger{std::move(surface_flinger)},+ m_shared_buffer_manager{std::move(shared_buffer_manager)} {// clang-format offstatic const FunctionInfo functions[] = {{1200, nullptr, "GetZOrderCountMin"},@@ -101,11 +102,11 @@ Result ISystemDisplayService::GetDisplayMode(Out<u32> out_width, Out<u32> out_heResult ISystemDisplayService::GetSharedBufferMemoryHandleId(Out<s32> out_nvmap_handle, Out<u64> out_size,- OutLargeData<Nvnflinger::SharedMemoryPoolLayout, BufferAttr_HipcMapAlias> out_pool_layout,- u64 buffer_id, ClientAppletResourceUserId aruid) {+ OutLargeData<SharedMemoryPoolLayout, BufferAttr_HipcMapAlias> out_pool_layout, u64 buffer_id,+ ClientAppletResourceUserId aruid) {LOG_INFO(Service_VI, "called. buffer_id={}, aruid={:#x}", buffer_id, aruid.pid);- R_RETURN(m_surface_flinger->GetSystemBufferManager().GetSharedBufferMemoryHandleId(+ R_RETURN(m_shared_buffer_manager->GetSharedBufferMemoryHandleId(out_size, out_nvmap_handle, out_pool_layout, buffer_id, aruid.pid));}@@ -123,8 +124,8 @@ Result ISystemDisplayService::AcquireSharedFrameBuffer(Out<android::Fence> out_fOut<std::array<s32, 4>> out_slots,Out<s64> out_target_slot, u64 layer_id) {LOG_DEBUG(Service_VI, "called");- R_RETURN(m_surface_flinger->GetSystemBufferManager().AcquireSharedFrameBuffer(- out_fence, *out_slots, out_target_slot, layer_id));+ R_RETURN(m_shared_buffer_manager->AcquireSharedFrameBuffer(out_fence, *out_slots,+ out_target_slot, layer_id));}Result ISystemDisplayService::PresentSharedFrameBuffer(android::Fence fence,@@ -132,15 +133,14 @@ Result ISystemDisplayService::PresentSharedFrameBuffer(android::Fence fence,u32 window_transform, s32 swap_interval,u64 layer_id, s64 surface_id) {LOG_DEBUG(Service_VI, "called");- R_RETURN(m_surface_flinger->GetSystemBufferManager().PresentSharedFrameBuffer(+ R_RETURN(m_shared_buffer_manager->PresentSharedFrameBuffer(fence, crop_region, window_transform, swap_interval, layer_id, surface_id));}Result ISystemDisplayService::GetSharedFrameBufferAcquirableEvent(OutCopyHandle<Kernel::KReadableEvent> out_event, u64 layer_id) {LOG_DEBUG(Service_VI, "called");- R_RETURN(m_surface_flinger->GetSystemBufferManager().GetSharedFrameBufferAcquirableEvent(- out_event, layer_id));+ R_RETURN(m_shared_buffer_manager->GetSharedFrameBufferAcquirableEvent(out_event, layer_id));}} // namespace Service::VIdiff --git a/src/core/hle/service/vi/system_display_service.h b/src/core/hle/service/vi/system_display_service.hindex 6c3f57ad75..b84c9725f2 100644--- a/src/core/hle/service/vi/system_display_service.h+++ b/src/core/hle/service/vi/system_display_service.h@@ -5,18 +5,21 @@#include "core/hle/service/cmif_types.h"#include "core/hle/service/nvnflinger/ui/fence.h"#include "core/hle/service/service.h"+#include "core/hle/service/vi/fbshare_buffer_manager.h"namespace Service::Nvnflinger {class Nvnflinger;-struct SharedMemoryPoolLayout;} // namespace Service::Nvnflingernamespace Service::VI {+class FbshareBufferManager;+class ISystemDisplayService final : public ServiceFramework<ISystemDisplayService> {public:explicit ISystemDisplayService(Core::System& system_,- std::shared_ptr<Nvnflinger::Nvnflinger> surface_flinger);+ std::shared_ptr<Nvnflinger::Nvnflinger> surface_flinger,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager);~ISystemDisplayService() override;private:@@ -27,7 +30,7 @@ private:Result GetSharedBufferMemoryHandleId(Out<s32> out_nvmap_handle, Out<u64> out_size,- OutLargeData<Nvnflinger::SharedMemoryPoolLayout, BufferAttr_HipcMapAlias> out_pool_layout,+ OutLargeData<SharedMemoryPoolLayout, BufferAttr_HipcMapAlias> out_pool_layout,u64 buffer_id, ClientAppletResourceUserId aruid);Result OpenSharedLayer(u64 layer_id);Result ConnectSharedLayer(u64 layer_id);@@ -42,6 +45,7 @@ private:private:const std::shared_ptr<Nvnflinger::Nvnflinger> m_surface_flinger;+ const std::shared_ptr<FbshareBufferManager> m_shared_buffer_manager;};} // namespace Service::VIdiff --git a/src/core/hle/service/vi/system_root_service.cpp b/src/core/hle/service/vi/system_root_service.cppindex 1d435ed6b4..2254ed1118 100644--- a/src/core/hle/service/vi/system_root_service.cpp+++ b/src/core/hle/service/vi/system_root_service.cpp@@ -11,8 +11,10 @@namespace Service::VI {ISystemRootService::ISystemRootService(Core::System& system_,- std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service)- : ServiceFramework{system_, "vi:s"}, m_binder_service{std::move(binder_service)} {+ std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager)+ : ServiceFramework{system_, "vi:s"}, m_binder_service{std::move(binder_service)},+ m_shared_buffer_manager{std::move(shared_buffer_manager)} {static const FunctionInfo functions[] = {{1, C<&ISystemRootService::GetDisplayService>, "GetDisplayService"},{3, nullptr, "GetDisplayServiceWithProxyNameExchange"},@@ -26,7 +28,7 @@ Result ISystemRootService::GetDisplayService(Out<SharedPointer<IApplicationDisplayService>> out_application_display_service, Policy policy) {LOG_DEBUG(Service_VI, "called");R_RETURN(GetApplicationDisplayService(out_application_display_service, system, m_binder_service,- Permission::System, policy));+ m_shared_buffer_manager, Permission::System, policy));}} // namespace Service::VIdiff --git a/src/core/hle/service/vi/system_root_service.h b/src/core/hle/service/vi/system_root_service.hindex 6f07c39fd6..16c997422f 100644--- a/src/core/hle/service/vi/system_root_service.h+++ b/src/core/hle/service/vi/system_root_service.h@@ -16,13 +16,15 @@ class IHOSBinderDriver;namespace Service::VI {+class FbshareBufferManager;class IApplicationDisplayService;enum class Policy : u32;class ISystemRootService final : public ServiceFramework<ISystemRootService> {public:explicit ISystemRootService(Core::System& system_,- std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service);+ std::shared_ptr<Nvnflinger::IHOSBinderDriver> binder_service,+ std::shared_ptr<FbshareBufferManager> shared_buffer_manager);~ISystemRootService() override;private:@@ -31,6 +33,7 @@ private:Policy policy);const std::shared_ptr<Nvnflinger::IHOSBinderDriver> m_binder_service;+ const std::shared_ptr<FbshareBufferManager> m_shared_buffer_manager;};} // namespace Service::VIdiff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cppindex d20f1fdea7..f361b9f4c4 100644--- a/src/core/hle/service/vi/vi.cpp+++ b/src/core/hle/service/vi/vi.cpp@@ -2,11 +2,13 @@// SPDX-License-Identifier: GPL-2.0-or-later#include "core/core.h"+#include "core/hle/service/nvdrv/nvdrv_interface.h"#include "core/hle/service/nvnflinger/hos_binder_driver.h"#include "core/hle/service/server_manager.h"#include "core/hle/service/sm/sm.h"#include "core/hle/service/vi/application_display_service.h"#include "core/hle/service/vi/application_root_service.h"+#include "core/hle/service/vi/fbshare_buffer_manager.h"#include "core/hle/service/vi/manager_root_service.h"#include "core/hle/service/vi/system_root_service.h"#include "core/hle/service/vi/vi.h"@@ -16,14 +18,22 @@ namespace Service::VI {void LoopProcess(Core::System& system) {const auto binder_service =system.ServiceManager().GetService<Nvnflinger::IHOSBinderDriver>("dispdrv", true);+ const auto nvdrv =+ system.ServiceManager().GetService<Nvidia::NVDRV>("nvdrv:s", true)->GetModule();+ const auto shared_buffer_manager =+ std::make_shared<FbshareBufferManager>(system, binder_service->GetSurfaceFlinger(), nvdrv);+auto server_manager = std::make_unique<ServerManager>(system);server_manager->RegisterNamedService(- "vi:m", std::make_shared<IManagerRootService>(system, binder_service));+ "vi:m",+ std::make_shared<IManagerRootService>(system, binder_service, shared_buffer_manager));server_manager->RegisterNamedService(- "vi:s", std::make_shared<ISystemRootService>(system, binder_service));+ "vi:s",+ std::make_shared<ISystemRootService>(system, binder_service, shared_buffer_manager));server_manager->RegisterNamedService(- "vi:u", std::make_shared<IApplicationRootService>(system, binder_service));+ "vi:u",+ std::make_shared<IApplicationRootService>(system, binder_service, shared_buffer_manager));ServerManager::RunServer(std::move(server_manager));}