From dcce9837d240fa2492f29e5ae2649085ae8f711c Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Wed, 14 Feb 2024 16:29:24 -0500
Subject: vi: move shared buffer management from nvnflinger

---
 src/core/hle/service/vi/vi.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/service/vi/vi.cpp')

diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index d20f1fdea..f361b9f4c 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));
 }
 
-- 
cgit v1.2.3