summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/common/logging/filter.cpp2
-rw-r--r--src/common/logging/types.h202
-rw-r--r--src/core/CMakeLists.txt58
-rw-r--r--src/core/hle/service/am/am.cpp23
-rw-r--r--src/core/hle/service/am/am.h10
-rw-r--r--src/core/hle/service/am/applet_ae.cpp36
-rw-r--r--src/core/hle/service/am/applet_ae.h8
-rw-r--r--src/core/hle/service/am/applet_oe.cpp22
-rw-r--r--src/core/hle/service/am/applet_oe.h8
-rw-r--r--src/core/hle/service/nvdrv/devices/nvdisp_disp0.h4
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.cpp6
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.h10
-rw-r--r--src/core/hle/service/nvnflinger/binder.h (renamed from src/core/hle/service/nvflinger/binder.h)0
-rw-r--r--src/core/hle/service/nvnflinger/buffer_item.h (renamed from src/core/hle/service/nvflinger/buffer_item.h)4
-rw-r--r--src/core/hle/service/nvnflinger/buffer_item_consumer.cpp (renamed from src/core/hle/service/nvflinger/buffer_item_consumer.cpp)12
-rw-r--r--src/core/hle/service/nvnflinger/buffer_item_consumer.h (renamed from src/core/hle/service/nvflinger/buffer_item_consumer.h)4
-rw-r--r--src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp (renamed from src/core/hle/service/nvflinger/buffer_queue_consumer.cpp)40
-rw-r--r--src/core/hle/service/nvnflinger/buffer_queue_consumer.h (renamed from src/core/hle/service/nvflinger/buffer_queue_consumer.h)4
-rw-r--r--src/core/hle/service/nvnflinger/buffer_queue_core.cpp (renamed from src/core/hle/service/nvflinger/buffer_queue_core.cpp)4
-rw-r--r--src/core/hle/service/nvnflinger/buffer_queue_core.h (renamed from src/core/hle/service/nvflinger/buffer_queue_core.h)10
-rw-r--r--src/core/hle/service/nvnflinger/buffer_queue_defs.h (renamed from src/core/hle/service/nvflinger/buffer_queue_defs.h)2
-rw-r--r--src/core/hle/service/nvnflinger/buffer_queue_producer.cpp (renamed from src/core/hle/service/nvflinger/buffer_queue_producer.cpp)136
-rw-r--r--src/core/hle/service/nvnflinger/buffer_queue_producer.h (renamed from src/core/hle/service/nvflinger/buffer_queue_producer.h)14
-rw-r--r--src/core/hle/service/nvnflinger/buffer_slot.h (renamed from src/core/hle/service/nvflinger/buffer_slot.h)2
-rw-r--r--src/core/hle/service/nvnflinger/buffer_transform_flags.h (renamed from src/core/hle/service/nvflinger/buffer_transform_flags.h)0
-rw-r--r--src/core/hle/service/nvnflinger/consumer_base.cpp (renamed from src/core/hle/service/nvflinger/consumer_base.cpp)24
-rw-r--r--src/core/hle/service/nvnflinger/consumer_base.h (renamed from src/core/hle/service/nvflinger/consumer_base.h)6
-rw-r--r--src/core/hle/service/nvnflinger/consumer_listener.h (renamed from src/core/hle/service/nvflinger/consumer_listener.h)0
-rw-r--r--src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp (renamed from src/core/hle/service/nvflinger/graphic_buffer_producer.cpp)4
-rw-r--r--src/core/hle/service/nvnflinger/graphic_buffer_producer.h (renamed from src/core/hle/service/nvflinger/graphic_buffer_producer.h)4
-rw-r--r--src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp (renamed from src/core/hle/service/nvflinger/hos_binder_driver_server.cpp)6
-rw-r--r--src/core/hle/service/nvnflinger/hos_binder_driver_server.h (renamed from src/core/hle/service/nvflinger/hos_binder_driver_server.h)6
-rw-r--r--src/core/hle/service/nvnflinger/nvnflinger.cpp (renamed from src/core/hle/service/nvflinger/nvflinger.cpp)58
-rw-r--r--src/core/hle/service/nvnflinger/nvnflinger.h (renamed from src/core/hle/service/nvflinger/nvflinger.h)10
-rw-r--r--src/core/hle/service/nvnflinger/parcel.h (renamed from src/core/hle/service/nvflinger/parcel.h)0
-rw-r--r--src/core/hle/service/nvnflinger/pixel_format.h (renamed from src/core/hle/service/nvflinger/pixel_format.h)0
-rw-r--r--src/core/hle/service/nvnflinger/producer_listener.h (renamed from src/core/hle/service/nvflinger/producer_listener.h)0
-rw-r--r--src/core/hle/service/nvnflinger/status.h (renamed from src/core/hle/service/nvflinger/status.h)0
-rw-r--r--src/core/hle/service/nvnflinger/ui/fence.h (renamed from src/core/hle/service/nvflinger/ui/fence.h)0
-rw-r--r--src/core/hle/service/nvnflinger/ui/graphic_buffer.h (renamed from src/core/hle/service/nvflinger/ui/graphic_buffer.h)2
-rw-r--r--src/core/hle/service/nvnflinger/window.h (renamed from src/core/hle/service/nvflinger/window.h)0
-rw-r--r--src/core/hle/service/service.cpp10
-rw-r--r--src/core/hle/service/service.h10
-rw-r--r--src/core/hle/service/vi/display/vi_display.cpp12
-rw-r--r--src/core/hle/service/vi/display/vi_display.h8
-rw-r--r--src/core/hle/service/vi/vi.cpp34
-rw-r--r--src/core/hle/service/vi/vi.h14
-rw-r--r--src/core/hle/service/vi/vi_m.cpp4
-rw-r--r--src/core/hle/service/vi/vi_m.h14
-rw-r--r--src/core/hle/service/vi/vi_s.cpp4
-rw-r--r--src/core/hle/service/vi/vi_s.h14
-rw-r--r--src/core/hle/service/vi/vi_u.cpp4
-rw-r--r--src/core/hle/service/vi/vi_u.h14
-rw-r--r--src/video_core/framebuffer_config.h4
54 files changed, 443 insertions, 444 deletions
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
index a959acb74..c95909561 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -119,7 +119,7 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
119 SUB(Service, NPNS) \ 119 SUB(Service, NPNS) \
120 SUB(Service, NS) \ 120 SUB(Service, NS) \
121 SUB(Service, NVDRV) \ 121 SUB(Service, NVDRV) \
122 SUB(Service, NVFlinger) \ 122 SUB(Service, Nvnflinger) \
123 SUB(Service, OLSC) \ 123 SUB(Service, OLSC) \
124 SUB(Service, PCIE) \ 124 SUB(Service, PCIE) \
125 SUB(Service, PCTL) \ 125 SUB(Service, PCTL) \
diff --git a/src/common/logging/types.h b/src/common/logging/types.h
index 595c15ada..8356e3183 100644
--- a/src/common/logging/types.h
+++ b/src/common/logging/types.h
@@ -29,107 +29,107 @@ enum class Level : u8 {
29 * filter.cpp. 29 * filter.cpp.
30 */ 30 */
31enum class Class : u8 { 31enum class Class : u8 {
32 Log, ///< Messages about the log system itself 32 Log, ///< Messages about the log system itself
33 Common, ///< Library routines 33 Common, ///< Library routines
34 Common_Filesystem, ///< Filesystem interface library 34 Common_Filesystem, ///< Filesystem interface library
35 Common_Memory, ///< Memory mapping and management functions 35 Common_Memory, ///< Memory mapping and management functions
36 Core, ///< LLE emulation core 36 Core, ///< LLE emulation core
37 Core_ARM, ///< ARM CPU core 37 Core_ARM, ///< ARM CPU core
38 Core_Timing, ///< CoreTiming functions 38 Core_Timing, ///< CoreTiming functions
39 Config, ///< Emulator configuration (including commandline) 39 Config, ///< Emulator configuration (including commandline)
40 Debug, ///< Debugging tools 40 Debug, ///< Debugging tools
41 Debug_Emulated, ///< Debug messages from the emulated programs 41 Debug_Emulated, ///< Debug messages from the emulated programs
42 Debug_GPU, ///< GPU debugging tools 42 Debug_GPU, ///< GPU debugging tools
43 Debug_Breakpoint, ///< Logging breakpoints and watchpoints 43 Debug_Breakpoint, ///< Logging breakpoints and watchpoints
44 Debug_GDBStub, ///< GDB Stub 44 Debug_GDBStub, ///< GDB Stub
45 Kernel, ///< The HLE implementation of the CTR kernel 45 Kernel, ///< The HLE implementation of the CTR kernel
46 Kernel_SVC, ///< Kernel system calls 46 Kernel_SVC, ///< Kernel system calls
47 Service, ///< HLE implementation of system services. Each major service 47 Service, ///< HLE implementation of system services. Each major service
48 ///< should have its own subclass. 48 ///< should have its own subclass.
49 Service_ACC, ///< The ACC (Accounts) service 49 Service_ACC, ///< The ACC (Accounts) service
50 Service_AM, ///< The AM (Applet manager) service 50 Service_AM, ///< The AM (Applet manager) service
51 Service_AOC, ///< The AOC (AddOn Content) service 51 Service_AOC, ///< The AOC (AddOn Content) service
52 Service_APM, ///< The APM (Performance) service 52 Service_APM, ///< The APM (Performance) service
53 Service_ARP, ///< The ARP service 53 Service_ARP, ///< The ARP service
54 Service_Audio, ///< The Audio (Audio control) service 54 Service_Audio, ///< The Audio (Audio control) service
55 Service_BCAT, ///< The BCAT service 55 Service_BCAT, ///< The BCAT service
56 Service_BGTC, ///< The BGTC (Background Task Controller) service 56 Service_BGTC, ///< The BGTC (Background Task Controller) service
57 Service_BPC, ///< The BPC service 57 Service_BPC, ///< The BPC service
58 Service_BTDRV, ///< The Bluetooth driver service 58 Service_BTDRV, ///< The Bluetooth driver service
59 Service_BTM, ///< The BTM service 59 Service_BTM, ///< The BTM service
60 Service_Capture, ///< The capture service 60 Service_Capture, ///< The capture service
61 Service_ERPT, ///< The error reporting service 61 Service_ERPT, ///< The error reporting service
62 Service_ETicket, ///< The ETicket service 62 Service_ETicket, ///< The ETicket service
63 Service_EUPLD, ///< The error upload service 63 Service_EUPLD, ///< The error upload service
64 Service_Fatal, ///< The Fatal service 64 Service_Fatal, ///< The Fatal service
65 Service_FGM, ///< The FGM service 65 Service_FGM, ///< The FGM service
66 Service_Friend, ///< The friend service 66 Service_Friend, ///< The friend service
67 Service_FS, ///< The FS (Filesystem) service 67 Service_FS, ///< The FS (Filesystem) service
68 Service_GRC, ///< The game recording service 68 Service_GRC, ///< The game recording service
69 Service_HID, ///< The HID (Human interface device) service 69 Service_HID, ///< The HID (Human interface device) service
70 Service_IRS, ///< The IRS service 70 Service_IRS, ///< The IRS service
71 Service_JIT, ///< The JIT service 71 Service_JIT, ///< The JIT service
72 Service_LBL, ///< The LBL (LCD backlight) service 72 Service_LBL, ///< The LBL (LCD backlight) service
73 Service_LDN, ///< The LDN (Local domain network) service 73 Service_LDN, ///< The LDN (Local domain network) service
74 Service_LDR, ///< The loader service 74 Service_LDR, ///< The loader service
75 Service_LM, ///< The LM (Logger) service 75 Service_LM, ///< The LM (Logger) service
76 Service_Migration, ///< The migration service 76 Service_Migration, ///< The migration service
77 Service_Mii, ///< The Mii service 77 Service_Mii, ///< The Mii service
78 Service_MM, ///< The MM (Multimedia) service 78 Service_MM, ///< The MM (Multimedia) service
79 Service_MNPP, ///< The MNPP service 79 Service_MNPP, ///< The MNPP service
80 Service_NCM, ///< The NCM service 80 Service_NCM, ///< The NCM service
81 Service_NFC, ///< The NFC (Near-field communication) service 81 Service_NFC, ///< The NFC (Near-field communication) service
82 Service_NFP, ///< The NFP service 82 Service_NFP, ///< The NFP service
83 Service_NGCT, ///< The NGCT (No Good Content for Terra) service 83 Service_NGCT, ///< The NGCT (No Good Content for Terra) service
84 Service_NIFM, ///< The NIFM (Network interface) service 84 Service_NIFM, ///< The NIFM (Network interface) service
85 Service_NIM, ///< The NIM service 85 Service_NIM, ///< The NIM service
86 Service_NOTIF, ///< The NOTIF (Notification) service 86 Service_NOTIF, ///< The NOTIF (Notification) service
87 Service_NPNS, ///< The NPNS service 87 Service_NPNS, ///< The NPNS service
88 Service_NS, ///< The NS services 88 Service_NS, ///< The NS services
89 Service_NVDRV, ///< The NVDRV (Nvidia driver) service 89 Service_NVDRV, ///< The NVDRV (Nvidia driver) service
90 Service_NVFlinger, ///< The NVFlinger service 90 Service_Nvnflinger, ///< The Nvnflinger service
91 Service_OLSC, ///< The OLSC service 91 Service_OLSC, ///< The OLSC service
92 Service_PCIE, ///< The PCIe service 92 Service_PCIE, ///< The PCIe service
93 Service_PCTL, ///< The PCTL (Parental control) service 93 Service_PCTL, ///< The PCTL (Parental control) service
94 Service_PCV, ///< The PCV service 94 Service_PCV, ///< The PCV service
95 Service_PM, ///< The PM service 95 Service_PM, ///< The PM service
96 Service_PREPO, ///< The PREPO (Play report) service 96 Service_PREPO, ///< The PREPO (Play report) service
97 Service_PSC, ///< The PSC service 97 Service_PSC, ///< The PSC service
98 Service_PTM, ///< The PTM service 98 Service_PTM, ///< The PTM service
99 Service_SET, ///< The SET (Settings) service 99 Service_SET, ///< The SET (Settings) service
100 Service_SM, ///< The SM (Service manager) service 100 Service_SM, ///< The SM (Service manager) service
101 Service_SPL, ///< The SPL service 101 Service_SPL, ///< The SPL service
102 Service_SSL, ///< The SSL service 102 Service_SSL, ///< The SSL service
103 Service_TCAP, ///< The TCAP service. 103 Service_TCAP, ///< The TCAP service.
104 Service_Time, ///< The time service 104 Service_Time, ///< The time service
105 Service_USB, ///< The USB (Universal Serial Bus) service 105 Service_USB, ///< The USB (Universal Serial Bus) service
106 Service_VI, ///< The VI (Video interface) service 106 Service_VI, ///< The VI (Video interface) service
107 Service_WLAN, ///< The WLAN (Wireless local area network) service 107 Service_WLAN, ///< The WLAN (Wireless local area network) service
108 HW, ///< Low-level hardware emulation 108 HW, ///< Low-level hardware emulation
109 HW_Memory, ///< Memory-map and address translation 109 HW_Memory, ///< Memory-map and address translation
110 HW_LCD, ///< LCD register emulation 110 HW_LCD, ///< LCD register emulation
111 HW_GPU, ///< GPU control emulation 111 HW_GPU, ///< GPU control emulation
112 HW_AES, ///< AES engine emulation 112 HW_AES, ///< AES engine emulation
113 IPC, ///< IPC interface 113 IPC, ///< IPC interface
114 Frontend, ///< Emulator UI 114 Frontend, ///< Emulator UI
115 Render, ///< Emulator video output and hardware acceleration 115 Render, ///< Emulator video output and hardware acceleration
116 Render_Software, ///< Software renderer backend 116 Render_Software, ///< Software renderer backend
117 Render_OpenGL, ///< OpenGL backend 117 Render_OpenGL, ///< OpenGL backend
118 Render_Vulkan, ///< Vulkan backend 118 Render_Vulkan, ///< Vulkan backend
119 Shader, ///< Shader recompiler 119 Shader, ///< Shader recompiler
120 Shader_SPIRV, ///< Shader SPIR-V code generation 120 Shader_SPIRV, ///< Shader SPIR-V code generation
121 Shader_GLASM, ///< Shader GLASM code generation 121 Shader_GLASM, ///< Shader GLASM code generation
122 Shader_GLSL, ///< Shader GLSL code generation 122 Shader_GLSL, ///< Shader GLSL code generation
123 Audio, ///< Audio emulation 123 Audio, ///< Audio emulation
124 Audio_DSP, ///< The HLE implementation of the DSP 124 Audio_DSP, ///< The HLE implementation of the DSP
125 Audio_Sink, ///< Emulator audio output backend 125 Audio_Sink, ///< Emulator audio output backend
126 Loader, ///< ROM loader 126 Loader, ///< ROM loader
127 CheatEngine, ///< Memory manipulation and engine VM functions 127 CheatEngine, ///< Memory manipulation and engine VM functions
128 Crypto, ///< Cryptographic engine/functions 128 Crypto, ///< Cryptographic engine/functions
129 Input, ///< Input emulation 129 Input, ///< Input emulation
130 Network, ///< Network emulation 130 Network, ///< Network emulation
131 WebService, ///< Interface to yuzu Web Services 131 WebService, ///< Interface to yuzu Web Services
132 Count ///< Total number of logging classes 132 Count ///< Total number of logging classes
133}; 133};
134 134
135} // namespace Common::Log 135} // namespace Common::Log
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 194cdd025..4a1a8bb43 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -626,35 +626,35 @@ add_library(core STATIC
626 hle/service/nvdrv/nvdrv_interface.h 626 hle/service/nvdrv/nvdrv_interface.h
627 hle/service/nvdrv/nvmemp.cpp 627 hle/service/nvdrv/nvmemp.cpp
628 hle/service/nvdrv/nvmemp.h 628 hle/service/nvdrv/nvmemp.h
629 hle/service/nvflinger/binder.h 629 hle/service/nvnflinger/binder.h
630 hle/service/nvflinger/buffer_item.h 630 hle/service/nvnflinger/buffer_item.h
631 hle/service/nvflinger/buffer_item_consumer.cpp 631 hle/service/nvnflinger/buffer_item_consumer.cpp
632 hle/service/nvflinger/buffer_item_consumer.h 632 hle/service/nvnflinger/buffer_item_consumer.h
633 hle/service/nvflinger/buffer_queue_consumer.cpp 633 hle/service/nvnflinger/buffer_queue_consumer.cpp
634 hle/service/nvflinger/buffer_queue_consumer.h 634 hle/service/nvnflinger/buffer_queue_consumer.h
635 hle/service/nvflinger/buffer_queue_core.cpp 635 hle/service/nvnflinger/buffer_queue_core.cpp
636 hle/service/nvflinger/buffer_queue_core.h 636 hle/service/nvnflinger/buffer_queue_core.h
637 hle/service/nvflinger/buffer_queue_defs.h 637 hle/service/nvnflinger/buffer_queue_defs.h
638 hle/service/nvflinger/buffer_queue_producer.cpp 638 hle/service/nvnflinger/buffer_queue_producer.cpp
639 hle/service/nvflinger/buffer_queue_producer.h 639 hle/service/nvnflinger/buffer_queue_producer.h
640 hle/service/nvflinger/buffer_slot.h 640 hle/service/nvnflinger/buffer_slot.h
641 hle/service/nvflinger/buffer_transform_flags.h 641 hle/service/nvnflinger/buffer_transform_flags.h
642 hle/service/nvflinger/consumer_base.cpp 642 hle/service/nvnflinger/consumer_base.cpp
643 hle/service/nvflinger/consumer_base.h 643 hle/service/nvnflinger/consumer_base.h
644 hle/service/nvflinger/consumer_listener.h 644 hle/service/nvnflinger/consumer_listener.h
645 hle/service/nvflinger/graphic_buffer_producer.cpp 645 hle/service/nvnflinger/graphic_buffer_producer.cpp
646 hle/service/nvflinger/graphic_buffer_producer.h 646 hle/service/nvnflinger/graphic_buffer_producer.h
647 hle/service/nvflinger/hos_binder_driver_server.cpp 647 hle/service/nvnflinger/hos_binder_driver_server.cpp
648 hle/service/nvflinger/hos_binder_driver_server.h 648 hle/service/nvnflinger/hos_binder_driver_server.h
649 hle/service/nvflinger/nvflinger.cpp 649 hle/service/nvnflinger/nvnflinger.cpp
650 hle/service/nvflinger/nvflinger.h 650 hle/service/nvnflinger/nvnflinger.h
651 hle/service/nvflinger/parcel.h 651 hle/service/nvnflinger/parcel.h
652 hle/service/nvflinger/pixel_format.h 652 hle/service/nvnflinger/pixel_format.h
653 hle/service/nvflinger/producer_listener.h 653 hle/service/nvnflinger/producer_listener.h
654 hle/service/nvflinger/status.h 654 hle/service/nvnflinger/status.h
655 hle/service/nvflinger/ui/fence.h 655 hle/service/nvnflinger/ui/fence.h
656 hle/service/nvflinger/ui/graphic_buffer.h 656 hle/service/nvnflinger/ui/graphic_buffer.h
657 hle/service/nvflinger/window.h 657 hle/service/nvnflinger/window.h
658 hle/service/olsc/olsc.cpp 658 hle/service/olsc/olsc.cpp
659 hle/service/olsc/olsc.h 659 hle/service/olsc/olsc.h
660 hle/service/pcie/pcie.cpp 660 hle/service/pcie/pcie.cpp
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 00b096f9e..f74c7b550 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -30,7 +30,7 @@
30#include "core/hle/service/filesystem/filesystem.h" 30#include "core/hle/service/filesystem/filesystem.h"
31#include "core/hle/service/ipc_helpers.h" 31#include "core/hle/service/ipc_helpers.h"
32#include "core/hle/service/ns/ns.h" 32#include "core/hle/service/ns/ns.h"
33#include "core/hle/service/nvflinger/nvflinger.h" 33#include "core/hle/service/nvnflinger/nvnflinger.h"
34#include "core/hle/service/pm/pm.h" 34#include "core/hle/service/pm/pm.h"
35#include "core/hle/service/server_manager.h" 35#include "core/hle/service/server_manager.h"
36#include "core/hle/service/sm/sm.h" 36#include "core/hle/service/sm/sm.h"
@@ -251,10 +251,9 @@ IDebugFunctions::IDebugFunctions(Core::System& system_)
251 251
252IDebugFunctions::~IDebugFunctions() = default; 252IDebugFunctions::~IDebugFunctions() = default;
253 253
254ISelfController::ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvflinger_) 254ISelfController::ISelfController(Core::System& system_, Nvnflinger::Nvnflinger& nvnflinger_)
255 : ServiceFramework{system_, "ISelfController"}, nvflinger{nvflinger_}, service_context{ 255 : ServiceFramework{system_, "ISelfController"}, nvnflinger{nvnflinger_},
256 system, 256 service_context{system, "ISelfController"} {
257 "ISelfController"} {
258 // clang-format off 257 // clang-format off
259 static const FunctionInfo functions[] = { 258 static const FunctionInfo functions[] = {
260 {0, &ISelfController::Exit, "Exit"}, 259 {0, &ISelfController::Exit, "Exit"},
@@ -470,8 +469,8 @@ void ISelfController::CreateManagedDisplayLayer(HLERequestContext& ctx) {
470 469
471 // TODO(Subv): Find out how AM determines the display to use, for now just 470 // TODO(Subv): Find out how AM determines the display to use, for now just
472 // create the layer in the Default display. 471 // create the layer in the Default display.
473 const auto display_id = nvflinger.OpenDisplay("Default"); 472 const auto display_id = nvnflinger.OpenDisplay("Default");
474 const auto layer_id = nvflinger.CreateLayer(*display_id); 473 const auto layer_id = nvnflinger.CreateLayer(*display_id);
475 474
476 IPC::ResponseBuilder rb{ctx, 4}; 475 IPC::ResponseBuilder rb{ctx, 4};
477 rb.Push(ResultSuccess); 476 rb.Push(ResultSuccess);
@@ -488,8 +487,8 @@ void ISelfController::CreateManagedDisplaySeparableLayer(HLERequestContext& ctx)
488 // Outputting 1 layer id instead of the expected 2 has not been observed to cause any adverse 487 // Outputting 1 layer id instead of the expected 2 has not been observed to cause any adverse
489 // side effects. 488 // side effects.
490 // TODO: Support multiple layers 489 // TODO: Support multiple layers
491 const auto display_id = nvflinger.OpenDisplay("Default"); 490 const auto display_id = nvnflinger.OpenDisplay("Default");
492 const auto layer_id = nvflinger.CreateLayer(*display_id); 491 const auto layer_id = nvnflinger.CreateLayer(*display_id);
493 492
494 IPC::ResponseBuilder rb{ctx, 4}; 493 IPC::ResponseBuilder rb{ctx, 4};
495 rb.Push(ResultSuccess); 494 rb.Push(ResultSuccess);
@@ -1826,7 +1825,7 @@ void IApplicationFunctions::PrepareForJit(HLERequestContext& ctx) {
1826 rb.Push(ResultSuccess); 1825 rb.Push(ResultSuccess);
1827} 1826}
1828 1827
1829void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { 1828void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system) {
1830 auto message_queue = std::make_shared<AppletMessageQueue>(system); 1829 auto message_queue = std::make_shared<AppletMessageQueue>(system);
1831 // Needed on game boot 1830 // Needed on game boot
1832 message_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged); 1831 message_queue->PushMessage(AppletMessageQueue::AppletMessage::FocusStateChanged);
@@ -1834,9 +1833,9 @@ void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) {
1834 auto server_manager = std::make_unique<ServerManager>(system); 1833 auto server_manager = std::make_unique<ServerManager>(system);
1835 1834
1836 server_manager->RegisterNamedService( 1835 server_manager->RegisterNamedService(
1837 "appletAE", std::make_shared<AppletAE>(nvflinger, message_queue, system)); 1836 "appletAE", std::make_shared<AppletAE>(nvnflinger, message_queue, system));
1838 server_manager->RegisterNamedService( 1837 server_manager->RegisterNamedService(
1839 "appletOE", std::make_shared<AppletOE>(nvflinger, message_queue, system)); 1838 "appletOE", std::make_shared<AppletOE>(nvnflinger, message_queue, system));
1840 server_manager->RegisterNamedService("idle:sys", std::make_shared<IdleSys>(system)); 1839 server_manager->RegisterNamedService("idle:sys", std::make_shared<IdleSys>(system));
1841 server_manager->RegisterNamedService("omm", std::make_shared<OMM>(system)); 1840 server_manager->RegisterNamedService("omm", std::make_shared<OMM>(system));
1842 server_manager->RegisterNamedService("spsm", std::make_shared<SPSM>(system)); 1841 server_manager->RegisterNamedService("spsm", std::make_shared<SPSM>(system));
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index fd3d4ddef..0dbc6485e 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -16,8 +16,8 @@ class KReadableEvent;
16class KTransferMemory; 16class KTransferMemory;
17} // namespace Kernel 17} // namespace Kernel
18 18
19namespace Service::NVFlinger { 19namespace Service::Nvnflinger {
20class NVFlinger; 20class Nvnflinger;
21} 21}
22 22
23namespace Service::AM { 23namespace Service::AM {
@@ -154,7 +154,7 @@ public:
154 154
155class ISelfController final : public ServiceFramework<ISelfController> { 155class ISelfController final : public ServiceFramework<ISelfController> {
156public: 156public:
157 explicit ISelfController(Core::System& system_, NVFlinger::NVFlinger& nvflinger_); 157 explicit ISelfController(Core::System& system_, Nvnflinger::Nvnflinger& nvnflinger_);
158 ~ISelfController() override; 158 ~ISelfController() override;
159 159
160private: 160private:
@@ -191,7 +191,7 @@ private:
191 Disable = 2, 191 Disable = 2,
192 }; 192 };
193 193
194 NVFlinger::NVFlinger& nvflinger; 194 Nvnflinger::Nvnflinger& nvnflinger;
195 195
196 KernelHelpers::ServiceContext service_context; 196 KernelHelpers::ServiceContext service_context;
197 197
@@ -397,6 +397,6 @@ public:
397 ~IProcessWindingController() override; 397 ~IProcessWindingController() override;
398}; 398};
399 399
400void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system); 400void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system);
401 401
402} // namespace Service::AM 402} // namespace Service::AM
diff --git a/src/core/hle/service/am/applet_ae.cpp b/src/core/hle/service/am/applet_ae.cpp
index e15b5ccfa..2764f7ceb 100644
--- a/src/core/hle/service/am/applet_ae.cpp
+++ b/src/core/hle/service/am/applet_ae.cpp
@@ -6,17 +6,17 @@
6#include "core/hle/service/am/am.h" 6#include "core/hle/service/am/am.h"
7#include "core/hle/service/am/applet_ae.h" 7#include "core/hle/service/am/applet_ae.h"
8#include "core/hle/service/ipc_helpers.h" 8#include "core/hle/service/ipc_helpers.h"
9#include "core/hle/service/nvflinger/nvflinger.h" 9#include "core/hle/service/nvnflinger/nvnflinger.h"
10 10
11namespace Service::AM { 11namespace Service::AM {
12 12
13class ILibraryAppletProxy final : public ServiceFramework<ILibraryAppletProxy> { 13class ILibraryAppletProxy final : public ServiceFramework<ILibraryAppletProxy> {
14public: 14public:
15 explicit ILibraryAppletProxy(NVFlinger::NVFlinger& nvflinger_, 15 explicit ILibraryAppletProxy(Nvnflinger::Nvnflinger& nvnflinger_,
16 std::shared_ptr<AppletMessageQueue> msg_queue_, 16 std::shared_ptr<AppletMessageQueue> msg_queue_,
17 Core::System& system_) 17 Core::System& system_)
18 : ServiceFramework{system_, "ILibraryAppletProxy"}, nvflinger{nvflinger_}, 18 : ServiceFramework{system_, "ILibraryAppletProxy"},
19 msg_queue{std::move(msg_queue_)} { 19 nvnflinger{nvnflinger_}, msg_queue{std::move(msg_queue_)} {
20 // clang-format off 20 // clang-format off
21 static const FunctionInfo functions[] = { 21 static const FunctionInfo functions[] = {
22 {0, &ILibraryAppletProxy::GetCommonStateGetter, "GetCommonStateGetter"}, 22 {0, &ILibraryAppletProxy::GetCommonStateGetter, "GetCommonStateGetter"},
@@ -49,7 +49,7 @@ private:
49 49
50 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 50 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
51 rb.Push(ResultSuccess); 51 rb.Push(ResultSuccess);
52 rb.PushIpcInterface<ISelfController>(system, nvflinger); 52 rb.PushIpcInterface<ISelfController>(system, nvnflinger);
53 } 53 }
54 54
55 void GetWindowController(HLERequestContext& ctx) { 55 void GetWindowController(HLERequestContext& ctx) {
@@ -108,17 +108,17 @@ private:
108 rb.PushIpcInterface<IApplicationFunctions>(system); 108 rb.PushIpcInterface<IApplicationFunctions>(system);
109 } 109 }
110 110
111 NVFlinger::NVFlinger& nvflinger; 111 Nvnflinger::Nvnflinger& nvnflinger;
112 std::shared_ptr<AppletMessageQueue> msg_queue; 112 std::shared_ptr<AppletMessageQueue> msg_queue;
113}; 113};
114 114
115class ISystemAppletProxy final : public ServiceFramework<ISystemAppletProxy> { 115class ISystemAppletProxy final : public ServiceFramework<ISystemAppletProxy> {
116public: 116public:
117 explicit ISystemAppletProxy(NVFlinger::NVFlinger& nvflinger_, 117 explicit ISystemAppletProxy(Nvnflinger::Nvnflinger& nvnflinger_,
118 std::shared_ptr<AppletMessageQueue> msg_queue_, 118 std::shared_ptr<AppletMessageQueue> msg_queue_,
119 Core::System& system_) 119 Core::System& system_)
120 : ServiceFramework{system_, "ISystemAppletProxy"}, nvflinger{nvflinger_}, 120 : ServiceFramework{system_, "ISystemAppletProxy"},
121 msg_queue{std::move(msg_queue_)} { 121 nvnflinger{nvnflinger_}, msg_queue{std::move(msg_queue_)} {
122 // clang-format off 122 // clang-format off
123 static const FunctionInfo functions[] = { 123 static const FunctionInfo functions[] = {
124 {0, &ISystemAppletProxy::GetCommonStateGetter, "GetCommonStateGetter"}, 124 {0, &ISystemAppletProxy::GetCommonStateGetter, "GetCommonStateGetter"},
@@ -153,7 +153,7 @@ private:
153 153
154 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 154 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
155 rb.Push(ResultSuccess); 155 rb.Push(ResultSuccess);
156 rb.PushIpcInterface<ISelfController>(system, nvflinger); 156 rb.PushIpcInterface<ISelfController>(system, nvnflinger);
157 } 157 }
158 158
159 void GetWindowController(HLERequestContext& ctx) { 159 void GetWindowController(HLERequestContext& ctx) {
@@ -220,7 +220,7 @@ private:
220 rb.PushIpcInterface<IApplicationCreator>(system); 220 rb.PushIpcInterface<IApplicationCreator>(system);
221 } 221 }
222 222
223 NVFlinger::NVFlinger& nvflinger; 223 Nvnflinger::Nvnflinger& nvnflinger;
224 std::shared_ptr<AppletMessageQueue> msg_queue; 224 std::shared_ptr<AppletMessageQueue> msg_queue;
225}; 225};
226 226
@@ -229,7 +229,7 @@ void AppletAE::OpenSystemAppletProxy(HLERequestContext& ctx) {
229 229
230 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 230 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
231 rb.Push(ResultSuccess); 231 rb.Push(ResultSuccess);
232 rb.PushIpcInterface<ISystemAppletProxy>(nvflinger, msg_queue, system); 232 rb.PushIpcInterface<ISystemAppletProxy>(nvnflinger, msg_queue, system);
233} 233}
234 234
235void AppletAE::OpenLibraryAppletProxy(HLERequestContext& ctx) { 235void AppletAE::OpenLibraryAppletProxy(HLERequestContext& ctx) {
@@ -237,7 +237,7 @@ void AppletAE::OpenLibraryAppletProxy(HLERequestContext& ctx) {
237 237
238 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 238 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
239 rb.Push(ResultSuccess); 239 rb.Push(ResultSuccess);
240 rb.PushIpcInterface<ILibraryAppletProxy>(nvflinger, msg_queue, system); 240 rb.PushIpcInterface<ILibraryAppletProxy>(nvnflinger, msg_queue, system);
241} 241}
242 242
243void AppletAE::OpenLibraryAppletProxyOld(HLERequestContext& ctx) { 243void AppletAE::OpenLibraryAppletProxyOld(HLERequestContext& ctx) {
@@ -245,13 +245,13 @@ void AppletAE::OpenLibraryAppletProxyOld(HLERequestContext& ctx) {
245 245
246 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 246 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
247 rb.Push(ResultSuccess); 247 rb.Push(ResultSuccess);
248 rb.PushIpcInterface<ILibraryAppletProxy>(nvflinger, msg_queue, system); 248 rb.PushIpcInterface<ILibraryAppletProxy>(nvnflinger, msg_queue, system);
249} 249}
250 250
251AppletAE::AppletAE(NVFlinger::NVFlinger& nvflinger_, std::shared_ptr<AppletMessageQueue> msg_queue_, 251AppletAE::AppletAE(Nvnflinger::Nvnflinger& nvnflinger_,
252 Core::System& system_) 252 std::shared_ptr<AppletMessageQueue> msg_queue_, Core::System& system_)
253 : ServiceFramework{system_, "appletAE"}, nvflinger{nvflinger_}, msg_queue{ 253 : ServiceFramework{system_, "appletAE"}, nvnflinger{nvnflinger_}, msg_queue{
254 std::move(msg_queue_)} { 254 std::move(msg_queue_)} {
255 // clang-format off 255 // clang-format off
256 static const FunctionInfo functions[] = { 256 static const FunctionInfo functions[] = {
257 {100, &AppletAE::OpenSystemAppletProxy, "OpenSystemAppletProxy"}, 257 {100, &AppletAE::OpenSystemAppletProxy, "OpenSystemAppletProxy"},
diff --git a/src/core/hle/service/am/applet_ae.h b/src/core/hle/service/am/applet_ae.h
index df8dccdc0..538ce2903 100644
--- a/src/core/hle/service/am/applet_ae.h
+++ b/src/core/hle/service/am/applet_ae.h
@@ -12,8 +12,8 @@ namespace FileSystem {
12class FileSystemController; 12class FileSystemController;
13} 13}
14 14
15namespace NVFlinger { 15namespace Nvnflinger {
16class NVFlinger; 16class Nvnflinger;
17} 17}
18 18
19namespace AM { 19namespace AM {
@@ -22,7 +22,7 @@ class AppletMessageQueue;
22 22
23class AppletAE final : public ServiceFramework<AppletAE> { 23class AppletAE final : public ServiceFramework<AppletAE> {
24public: 24public:
25 explicit AppletAE(NVFlinger::NVFlinger& nvflinger_, 25 explicit AppletAE(Nvnflinger::Nvnflinger& nvnflinger_,
26 std::shared_ptr<AppletMessageQueue> msg_queue_, Core::System& system_); 26 std::shared_ptr<AppletMessageQueue> msg_queue_, Core::System& system_);
27 ~AppletAE() override; 27 ~AppletAE() override;
28 28
@@ -33,7 +33,7 @@ private:
33 void OpenLibraryAppletProxy(HLERequestContext& ctx); 33 void OpenLibraryAppletProxy(HLERequestContext& ctx);
34 void OpenLibraryAppletProxyOld(HLERequestContext& ctx); 34 void OpenLibraryAppletProxyOld(HLERequestContext& ctx);
35 35
36 NVFlinger::NVFlinger& nvflinger; 36 Nvnflinger::Nvnflinger& nvnflinger;
37 std::shared_ptr<AppletMessageQueue> msg_queue; 37 std::shared_ptr<AppletMessageQueue> msg_queue;
38}; 38};
39 39
diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp
index 75c330f0a..d6c565d85 100644
--- a/src/core/hle/service/am/applet_oe.cpp
+++ b/src/core/hle/service/am/applet_oe.cpp
@@ -5,17 +5,17 @@
5#include "core/hle/service/am/am.h" 5#include "core/hle/service/am/am.h"
6#include "core/hle/service/am/applet_oe.h" 6#include "core/hle/service/am/applet_oe.h"
7#include "core/hle/service/ipc_helpers.h" 7#include "core/hle/service/ipc_helpers.h"
8#include "core/hle/service/nvflinger/nvflinger.h" 8#include "core/hle/service/nvnflinger/nvnflinger.h"
9 9
10namespace Service::AM { 10namespace Service::AM {
11 11
12class IApplicationProxy final : public ServiceFramework<IApplicationProxy> { 12class IApplicationProxy final : public ServiceFramework<IApplicationProxy> {
13public: 13public:
14 explicit IApplicationProxy(NVFlinger::NVFlinger& nvflinger_, 14 explicit IApplicationProxy(Nvnflinger::Nvnflinger& nvnflinger_,
15 std::shared_ptr<AppletMessageQueue> msg_queue_, 15 std::shared_ptr<AppletMessageQueue> msg_queue_,
16 Core::System& system_) 16 Core::System& system_)
17 : ServiceFramework{system_, "IApplicationProxy"}, nvflinger{nvflinger_}, 17 : ServiceFramework{system_, "IApplicationProxy"},
18 msg_queue{std::move(msg_queue_)} { 18 nvnflinger{nvnflinger_}, msg_queue{std::move(msg_queue_)} {
19 // clang-format off 19 // clang-format off
20 static const FunctionInfo functions[] = { 20 static const FunctionInfo functions[] = {
21 {0, &IApplicationProxy::GetCommonStateGetter, "GetCommonStateGetter"}, 21 {0, &IApplicationProxy::GetCommonStateGetter, "GetCommonStateGetter"},
@@ -71,7 +71,7 @@ private:
71 71
72 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 72 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
73 rb.Push(ResultSuccess); 73 rb.Push(ResultSuccess);
74 rb.PushIpcInterface<ISelfController>(system, nvflinger); 74 rb.PushIpcInterface<ISelfController>(system, nvnflinger);
75 } 75 }
76 76
77 void GetCommonStateGetter(HLERequestContext& ctx) { 77 void GetCommonStateGetter(HLERequestContext& ctx) {
@@ -98,7 +98,7 @@ private:
98 rb.PushIpcInterface<IApplicationFunctions>(system); 98 rb.PushIpcInterface<IApplicationFunctions>(system);
99 } 99 }
100 100
101 NVFlinger::NVFlinger& nvflinger; 101 Nvnflinger::Nvnflinger& nvnflinger;
102 std::shared_ptr<AppletMessageQueue> msg_queue; 102 std::shared_ptr<AppletMessageQueue> msg_queue;
103}; 103};
104 104
@@ -107,13 +107,13 @@ void AppletOE::OpenApplicationProxy(HLERequestContext& ctx) {
107 107
108 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 108 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
109 rb.Push(ResultSuccess); 109 rb.Push(ResultSuccess);
110 rb.PushIpcInterface<IApplicationProxy>(nvflinger, msg_queue, system); 110 rb.PushIpcInterface<IApplicationProxy>(nvnflinger, msg_queue, system);
111} 111}
112 112
113AppletOE::AppletOE(NVFlinger::NVFlinger& nvflinger_, std::shared_ptr<AppletMessageQueue> msg_queue_, 113AppletOE::AppletOE(Nvnflinger::Nvnflinger& nvnflinger_,
114 Core::System& system_) 114 std::shared_ptr<AppletMessageQueue> msg_queue_, Core::System& system_)
115 : ServiceFramework{system_, "appletOE"}, nvflinger{nvflinger_}, msg_queue{ 115 : ServiceFramework{system_, "appletOE"}, nvnflinger{nvnflinger_}, msg_queue{
116 std::move(msg_queue_)} { 116 std::move(msg_queue_)} {
117 static const FunctionInfo functions[] = { 117 static const FunctionInfo functions[] = {
118 {0, &AppletOE::OpenApplicationProxy, "OpenApplicationProxy"}, 118 {0, &AppletOE::OpenApplicationProxy, "OpenApplicationProxy"},
119 }; 119 };
diff --git a/src/core/hle/service/am/applet_oe.h b/src/core/hle/service/am/applet_oe.h
index f34e4224e..39eccc4ab 100644
--- a/src/core/hle/service/am/applet_oe.h
+++ b/src/core/hle/service/am/applet_oe.h
@@ -12,8 +12,8 @@ namespace FileSystem {
12class FileSystemController; 12class FileSystemController;
13} 13}
14 14
15namespace NVFlinger { 15namespace Nvnflinger {
16class NVFlinger; 16class Nvnflinger;
17} 17}
18 18
19namespace AM { 19namespace AM {
@@ -22,7 +22,7 @@ class AppletMessageQueue;
22 22
23class AppletOE final : public ServiceFramework<AppletOE> { 23class AppletOE final : public ServiceFramework<AppletOE> {
24public: 24public:
25 explicit AppletOE(NVFlinger::NVFlinger& nvflinger_, 25 explicit AppletOE(Nvnflinger::Nvnflinger& nvnflinger_,
26 std::shared_ptr<AppletMessageQueue> msg_queue_, Core::System& system_); 26 std::shared_ptr<AppletMessageQueue> msg_queue_, Core::System& system_);
27 ~AppletOE() override; 27 ~AppletOE() override;
28 28
@@ -31,7 +31,7 @@ public:
31private: 31private:
32 void OpenApplicationProxy(HLERequestContext& ctx); 32 void OpenApplicationProxy(HLERequestContext& ctx);
33 33
34 NVFlinger::NVFlinger& nvflinger; 34 Nvnflinger::Nvnflinger& nvnflinger;
35 std::shared_ptr<AppletMessageQueue> msg_queue; 35 std::shared_ptr<AppletMessageQueue> msg_queue;
36}; 36};
37 37
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h
index 81bd7960a..bcd0e3ed5 100644
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h
@@ -8,8 +8,8 @@
8#include "common/common_types.h" 8#include "common/common_types.h"
9#include "common/math_util.h" 9#include "common/math_util.h"
10#include "core/hle/service/nvdrv/devices/nvdevice.h" 10#include "core/hle/service/nvdrv/devices/nvdevice.h"
11#include "core/hle/service/nvflinger/buffer_transform_flags.h" 11#include "core/hle/service/nvnflinger/buffer_transform_flags.h"
12#include "core/hle/service/nvflinger/pixel_format.h" 12#include "core/hle/service/nvnflinger/pixel_format.h"
13 13
14namespace Service::Nvidia::NvCore { 14namespace Service::Nvidia::NvCore {
15class Container; 15class Container;
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 5e71ec99f..3d774eec4 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -23,7 +23,7 @@
23#include "core/hle/service/nvdrv/nvdrv.h" 23#include "core/hle/service/nvdrv/nvdrv.h"
24#include "core/hle/service/nvdrv/nvdrv_interface.h" 24#include "core/hle/service/nvdrv/nvdrv_interface.h"
25#include "core/hle/service/nvdrv/nvmemp.h" 25#include "core/hle/service/nvdrv/nvmemp.h"
26#include "core/hle/service/nvflinger/nvflinger.h" 26#include "core/hle/service/nvnflinger/nvnflinger.h"
27#include "core/hle/service/server_manager.h" 27#include "core/hle/service/server_manager.h"
28#include "video_core/gpu.h" 28#include "video_core/gpu.h"
29 29
@@ -42,7 +42,7 @@ void EventInterface::FreeEvent(Kernel::KEvent* event) {
42 module.service_context.CloseEvent(event); 42 module.service_context.CloseEvent(event);
43} 43}
44 44
45void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) { 45void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system) {
46 auto server_manager = std::make_unique<ServerManager>(system); 46 auto server_manager = std::make_unique<ServerManager>(system);
47 auto module = std::make_shared<Module>(system); 47 auto module = std::make_shared<Module>(system);
48 server_manager->RegisterNamedService("nvdrv", std::make_shared<NVDRV>(system, module, "nvdrv")); 48 server_manager->RegisterNamedService("nvdrv", std::make_shared<NVDRV>(system, module, "nvdrv"));
@@ -53,7 +53,7 @@ void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system) {
53 server_manager->RegisterNamedService("nvdrv:t", 53 server_manager->RegisterNamedService("nvdrv:t",
54 std::make_shared<NVDRV>(system, module, "nvdrv:t")); 54 std::make_shared<NVDRV>(system, module, "nvdrv:t"));
55 server_manager->RegisterNamedService("nvmemp", std::make_shared<NVMEMP>(system)); 55 server_manager->RegisterNamedService("nvmemp", std::make_shared<NVMEMP>(system));
56 nvflinger.SetNVDrvInstance(module); 56 nvnflinger.SetNVDrvInstance(module);
57 ServerManager::RunServer(std::move(server_manager)); 57 ServerManager::RunServer(std::move(server_manager));
58} 58}
59 59
diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h
index b2270cf76..668be742b 100644
--- a/src/core/hle/service/nvdrv/nvdrv.h
+++ b/src/core/hle/service/nvdrv/nvdrv.h
@@ -16,7 +16,7 @@
16#include "core/hle/service/kernel_helpers.h" 16#include "core/hle/service/kernel_helpers.h"
17#include "core/hle/service/nvdrv/core/container.h" 17#include "core/hle/service/nvdrv/core/container.h"
18#include "core/hle/service/nvdrv/nvdata.h" 18#include "core/hle/service/nvdrv/nvdata.h"
19#include "core/hle/service/nvflinger/ui/fence.h" 19#include "core/hle/service/nvnflinger/ui/fence.h"
20#include "core/hle/service/service.h" 20#include "core/hle/service/service.h"
21 21
22namespace Core { 22namespace Core {
@@ -27,8 +27,8 @@ namespace Kernel {
27class KEvent; 27class KEvent;
28} 28}
29 29
30namespace Service::NVFlinger { 30namespace Service::Nvnflinger {
31class NVFlinger; 31class Nvnflinger;
32} 32}
33 33
34namespace Service::Nvidia { 34namespace Service::Nvidia {
@@ -95,7 +95,7 @@ public:
95 95
96private: 96private:
97 friend class EventInterface; 97 friend class EventInterface;
98 friend class Service::NVFlinger::NVFlinger; 98 friend class Service::Nvnflinger::Nvnflinger;
99 99
100 /// Manages syncpoints on the host 100 /// Manages syncpoints on the host
101 NvCore::Container container; 101 NvCore::Container container;
@@ -114,6 +114,6 @@ private:
114 std::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders; 114 std::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders;
115}; 115};
116 116
117void LoopProcess(NVFlinger::NVFlinger& nvflinger, Core::System& system); 117void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system);
118 118
119} // namespace Service::Nvidia 119} // namespace Service::Nvidia
diff --git a/src/core/hle/service/nvflinger/binder.h b/src/core/hle/service/nvnflinger/binder.h
index aef1477e3..aef1477e3 100644
--- a/src/core/hle/service/nvflinger/binder.h
+++ b/src/core/hle/service/nvnflinger/binder.h
diff --git a/src/core/hle/service/nvflinger/buffer_item.h b/src/core/hle/service/nvnflinger/buffer_item.h
index f73dec4f1..7fd808f54 100644
--- a/src/core/hle/service/nvflinger/buffer_item.h
+++ b/src/core/hle/service/nvnflinger/buffer_item.h
@@ -10,8 +10,8 @@
10 10
11#include "common/common_types.h" 11#include "common/common_types.h"
12#include "common/math_util.h" 12#include "common/math_util.h"
13#include "core/hle/service/nvflinger/ui/fence.h" 13#include "core/hle/service/nvnflinger/ui/fence.h"
14#include "core/hle/service/nvflinger/window.h" 14#include "core/hle/service/nvnflinger/window.h"
15 15
16namespace Service::android { 16namespace Service::android {
17 17
diff --git a/src/core/hle/service/nvflinger/buffer_item_consumer.cpp b/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp
index 152bb5bdf..cf151ea3a 100644
--- a/src/core/hle/service/nvflinger/buffer_item_consumer.cpp
+++ b/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp
@@ -6,9 +6,9 @@
6 6
7#include "common/assert.h" 7#include "common/assert.h"
8#include "common/logging/log.h" 8#include "common/logging/log.h"
9#include "core/hle/service/nvflinger/buffer_item.h" 9#include "core/hle/service/nvnflinger/buffer_item.h"
10#include "core/hle/service/nvflinger/buffer_item_consumer.h" 10#include "core/hle/service/nvnflinger/buffer_item_consumer.h"
11#include "core/hle/service/nvflinger/buffer_queue_consumer.h" 11#include "core/hle/service/nvnflinger/buffer_queue_consumer.h"
12 12
13namespace Service::android { 13namespace Service::android {
14 14
@@ -25,7 +25,7 @@ Status BufferItemConsumer::AcquireBuffer(BufferItem* item, std::chrono::nanoseco
25 25
26 if (const auto status = AcquireBufferLocked(item, present_when); status != Status::NoError) { 26 if (const auto status = AcquireBufferLocked(item, present_when); status != Status::NoError) {
27 if (status != Status::NoBufferAvailable) { 27 if (status != Status::NoBufferAvailable) {
28 LOG_ERROR(Service_NVFlinger, "Failed to acquire buffer: {}", status); 28 LOG_ERROR(Service_Nvnflinger, "Failed to acquire buffer: {}", status);
29 } 29 }
30 return status; 30 return status;
31 } 31 }
@@ -44,12 +44,12 @@ Status BufferItemConsumer::ReleaseBuffer(const BufferItem& item, const Fence& re
44 44
45 if (const auto status = AddReleaseFenceLocked(item.buf, item.graphic_buffer, release_fence); 45 if (const auto status = AddReleaseFenceLocked(item.buf, item.graphic_buffer, release_fence);
46 status != Status::NoError) { 46 status != Status::NoError) {
47 LOG_ERROR(Service_NVFlinger, "Failed to add fence: {}", status); 47 LOG_ERROR(Service_Nvnflinger, "Failed to add fence: {}", status);
48 } 48 }
49 49
50 if (const auto status = ReleaseBufferLocked(item.buf, item.graphic_buffer); 50 if (const auto status = ReleaseBufferLocked(item.buf, item.graphic_buffer);
51 status != Status::NoError) { 51 status != Status::NoError) {
52 LOG_WARNING(Service_NVFlinger, "Failed to release buffer: {}", status); 52 LOG_WARNING(Service_Nvnflinger, "Failed to release buffer: {}", status);
53 return status; 53 return status;
54 } 54 }
55 55
diff --git a/src/core/hle/service/nvflinger/buffer_item_consumer.h b/src/core/hle/service/nvnflinger/buffer_item_consumer.h
index a5c655d9e..e0c6b3604 100644
--- a/src/core/hle/service/nvflinger/buffer_item_consumer.h
+++ b/src/core/hle/service/nvnflinger/buffer_item_consumer.h
@@ -10,8 +10,8 @@
10#include <memory> 10#include <memory>
11 11
12#include "common/common_types.h" 12#include "common/common_types.h"
13#include "core/hle/service/nvflinger/consumer_base.h" 13#include "core/hle/service/nvnflinger/consumer_base.h"
14#include "core/hle/service/nvflinger/status.h" 14#include "core/hle/service/nvnflinger/status.h"
15 15
16namespace Service::android { 16namespace Service::android {
17 17
diff --git a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp
index 0767e548d..51291539d 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_consumer.cpp
+++ b/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp
@@ -6,11 +6,11 @@
6 6
7#include "common/logging/log.h" 7#include "common/logging/log.h"
8#include "core/hle/service/nvdrv/core/nvmap.h" 8#include "core/hle/service/nvdrv/core/nvmap.h"
9#include "core/hle/service/nvflinger/buffer_item.h" 9#include "core/hle/service/nvnflinger/buffer_item.h"
10#include "core/hle/service/nvflinger/buffer_queue_consumer.h" 10#include "core/hle/service/nvnflinger/buffer_queue_consumer.h"
11#include "core/hle/service/nvflinger/buffer_queue_core.h" 11#include "core/hle/service/nvnflinger/buffer_queue_core.h"
12#include "core/hle/service/nvflinger/producer_listener.h" 12#include "core/hle/service/nvnflinger/producer_listener.h"
13#include "core/hle/service/nvflinger/ui/graphic_buffer.h" 13#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"
14 14
15namespace Service::android { 15namespace Service::android {
16 16
@@ -31,7 +31,7 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer,
31 }))}; 31 }))};
32 32
33 if (num_acquired_buffers >= core->max_acquired_buffer_count + 1) { 33 if (num_acquired_buffers >= core->max_acquired_buffer_count + 1) {
34 LOG_ERROR(Service_NVFlinger, "max acquired buffer count reached: {} (max {})", 34 LOG_ERROR(Service_Nvnflinger, "max acquired buffer count reached: {} (max {})",
35 num_acquired_buffers, core->max_acquired_buffer_count); 35 num_acquired_buffers, core->max_acquired_buffer_count);
36 return Status::InvalidOperation; 36 return Status::InvalidOperation;
37 } 37 }
@@ -57,12 +57,12 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer,
57 if (desired_present < expected_present.count() - MAX_REASONABLE_NSEC || 57 if (desired_present < expected_present.count() - MAX_REASONABLE_NSEC ||
58 desired_present > expected_present.count()) { 58 desired_present > expected_present.count()) {
59 // This buffer is set to display in the near future, or desired_present is garbage. 59 // This buffer is set to display in the near future, or desired_present is garbage.
60 LOG_DEBUG(Service_NVFlinger, "nodrop desire={} expect={}", desired_present, 60 LOG_DEBUG(Service_Nvnflinger, "nodrop desire={} expect={}", desired_present,
61 expected_present.count()); 61 expected_present.count());
62 break; 62 break;
63 } 63 }
64 64
65 LOG_DEBUG(Service_NVFlinger, "drop desire={} expect={} size={}", desired_present, 65 LOG_DEBUG(Service_Nvnflinger, "drop desire={} expect={} size={}", desired_present,
66 expected_present.count(), core->queue.size()); 66 expected_present.count(), core->queue.size());
67 67
68 if (core->StillTracking(*front)) { 68 if (core->StillTracking(*front)) {
@@ -78,19 +78,19 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer,
78 const auto desired_present = front->timestamp; 78 const auto desired_present = front->timestamp;
79 if (desired_present > expected_present.count() && 79 if (desired_present > expected_present.count() &&
80 desired_present < expected_present.count() + MAX_REASONABLE_NSEC) { 80 desired_present < expected_present.count() + MAX_REASONABLE_NSEC) {
81 LOG_DEBUG(Service_NVFlinger, "defer desire={} expect={}", desired_present, 81 LOG_DEBUG(Service_Nvnflinger, "defer desire={} expect={}", desired_present,
82 expected_present.count()); 82 expected_present.count());
83 return Status::PresentLater; 83 return Status::PresentLater;
84 } 84 }
85 85
86 LOG_DEBUG(Service_NVFlinger, "accept desire={} expect={}", desired_present, 86 LOG_DEBUG(Service_Nvnflinger, "accept desire={} expect={}", desired_present,
87 expected_present.count()); 87 expected_present.count());
88 } 88 }
89 89
90 const auto slot = front->slot; 90 const auto slot = front->slot;
91 *out_buffer = *front; 91 *out_buffer = *front;
92 92
93 LOG_DEBUG(Service_NVFlinger, "acquiring slot={}", slot); 93 LOG_DEBUG(Service_Nvnflinger, "acquiring slot={}", slot);
94 94
95 // If the buffer has previously been acquired by the consumer, set graphic_buffer to nullptr to 95 // If the buffer has previously been acquired by the consumer, set graphic_buffer to nullptr to
96 // avoid unnecessarily remapping this buffer on the consumer side. 96 // avoid unnecessarily remapping this buffer on the consumer side.
@@ -109,7 +109,7 @@ Status BufferQueueConsumer::AcquireBuffer(BufferItem* out_buffer,
109 109
110Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fence& release_fence) { 110Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fence& release_fence) {
111 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { 111 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) {
112 LOG_ERROR(Service_NVFlinger, "slot {} out of range", slot); 112 LOG_ERROR(Service_Nvnflinger, "slot {} out of range", slot);
113 return Status::BadValue; 113 return Status::BadValue;
114 } 114 }
115 115
@@ -127,7 +127,7 @@ Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fenc
127 auto current(core->queue.begin()); 127 auto current(core->queue.begin());
128 while (current != core->queue.end()) { 128 while (current != core->queue.end()) {
129 if (current->slot == slot) { 129 if (current->slot == slot) {
130 LOG_ERROR(Service_NVFlinger, "buffer slot {} pending release is currently queued", 130 LOG_ERROR(Service_Nvnflinger, "buffer slot {} pending release is currently queued",
131 slot); 131 slot);
132 return Status::BadValue; 132 return Status::BadValue;
133 } 133 }
@@ -140,7 +140,7 @@ Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fenc
140 140
141 listener = core->connected_producer_listener; 141 listener = core->connected_producer_listener;
142 142
143 LOG_DEBUG(Service_NVFlinger, "releasing slot {}", slot); 143 LOG_DEBUG(Service_Nvnflinger, "releasing slot {}", slot);
144 144
145 core->SignalDequeueCondition(); 145 core->SignalDequeueCondition();
146 } 146 }
@@ -156,16 +156,16 @@ Status BufferQueueConsumer::ReleaseBuffer(s32 slot, u64 frame_number, const Fenc
156Status BufferQueueConsumer::Connect(std::shared_ptr<IConsumerListener> consumer_listener, 156Status BufferQueueConsumer::Connect(std::shared_ptr<IConsumerListener> consumer_listener,
157 bool controlled_by_app) { 157 bool controlled_by_app) {
158 if (consumer_listener == nullptr) { 158 if (consumer_listener == nullptr) {
159 LOG_ERROR(Service_NVFlinger, "consumer_listener may not be nullptr"); 159 LOG_ERROR(Service_Nvnflinger, "consumer_listener may not be nullptr");
160 return Status::BadValue; 160 return Status::BadValue;
161 } 161 }
162 162
163 LOG_DEBUG(Service_NVFlinger, "controlled_by_app={}", controlled_by_app); 163 LOG_DEBUG(Service_Nvnflinger, "controlled_by_app={}", controlled_by_app);
164 164
165 std::scoped_lock lock{core->mutex}; 165 std::scoped_lock lock{core->mutex};
166 166
167 if (core->is_abandoned) { 167 if (core->is_abandoned) {
168 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 168 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
169 return Status::NoInit; 169 return Status::NoInit;
170 } 170 }
171 171
@@ -177,14 +177,14 @@ Status BufferQueueConsumer::Connect(std::shared_ptr<IConsumerListener> consumer_
177 177
178Status BufferQueueConsumer::GetReleasedBuffers(u64* out_slot_mask) { 178Status BufferQueueConsumer::GetReleasedBuffers(u64* out_slot_mask) {
179 if (out_slot_mask == nullptr) { 179 if (out_slot_mask == nullptr) {
180 LOG_ERROR(Service_NVFlinger, "out_slot_mask may not be nullptr"); 180 LOG_ERROR(Service_Nvnflinger, "out_slot_mask may not be nullptr");
181 return Status::BadValue; 181 return Status::BadValue;
182 } 182 }
183 183
184 std::scoped_lock lock{core->mutex}; 184 std::scoped_lock lock{core->mutex};
185 185
186 if (core->is_abandoned) { 186 if (core->is_abandoned) {
187 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 187 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
188 return Status::NoInit; 188 return Status::NoInit;
189 } 189 }
190 190
@@ -205,7 +205,7 @@ Status BufferQueueConsumer::GetReleasedBuffers(u64* out_slot_mask) {
205 ++current; 205 ++current;
206 } 206 }
207 207
208 LOG_DEBUG(Service_NVFlinger, "returning mask {}", mask); 208 LOG_DEBUG(Service_Nvnflinger, "returning mask {}", mask);
209 *out_slot_mask = mask; 209 *out_slot_mask = mask;
210 return Status::NoError; 210 return Status::NoError;
211} 211}
diff --git a/src/core/hle/service/nvflinger/buffer_queue_consumer.h b/src/core/hle/service/nvnflinger/buffer_queue_consumer.h
index 4ec06ca13..50ed0bb5f 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_consumer.h
+++ b/src/core/hle/service/nvnflinger/buffer_queue_consumer.h
@@ -10,8 +10,8 @@
10#include <memory> 10#include <memory>
11 11
12#include "common/common_types.h" 12#include "common/common_types.h"
13#include "core/hle/service/nvflinger/buffer_queue_defs.h" 13#include "core/hle/service/nvnflinger/buffer_queue_defs.h"
14#include "core/hle/service/nvflinger/status.h" 14#include "core/hle/service/nvnflinger/status.h"
15 15
16namespace Service::Nvidia::NvCore { 16namespace Service::Nvidia::NvCore {
17class NvMap; 17class NvMap;
diff --git a/src/core/hle/service/nvflinger/buffer_queue_core.cpp b/src/core/hle/service/nvnflinger/buffer_queue_core.cpp
index 3d1338e66..2dbe29616 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_core.cpp
+++ b/src/core/hle/service/nvnflinger/buffer_queue_core.cpp
@@ -6,7 +6,7 @@
6 6
7#include "common/assert.h" 7#include "common/assert.h"
8 8
9#include "core/hle/service/nvflinger/buffer_queue_core.h" 9#include "core/hle/service/nvnflinger/buffer_queue_core.h"
10 10
11namespace Service::android { 11namespace Service::android {
12 12
@@ -82,7 +82,7 @@ s32 BufferQueueCore::GetPreallocatedBufferCountLocked() const {
82} 82}
83 83
84void BufferQueueCore::FreeBufferLocked(s32 slot) { 84void BufferQueueCore::FreeBufferLocked(s32 slot) {
85 LOG_DEBUG(Service_NVFlinger, "slot {}", slot); 85 LOG_DEBUG(Service_Nvnflinger, "slot {}", slot);
86 86
87 slots[slot].graphic_buffer.reset(); 87 slots[slot].graphic_buffer.reset();
88 88
diff --git a/src/core/hle/service/nvflinger/buffer_queue_core.h b/src/core/hle/service/nvnflinger/buffer_queue_core.h
index 85b3bc4c1..9164f08a0 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_core.h
+++ b/src/core/hle/service/nvnflinger/buffer_queue_core.h
@@ -13,11 +13,11 @@
13#include <set> 13#include <set>
14#include <vector> 14#include <vector>
15 15
16#include "core/hle/service/nvflinger/buffer_item.h" 16#include "core/hle/service/nvnflinger/buffer_item.h"
17#include "core/hle/service/nvflinger/buffer_queue_defs.h" 17#include "core/hle/service/nvnflinger/buffer_queue_defs.h"
18#include "core/hle/service/nvflinger/pixel_format.h" 18#include "core/hle/service/nvnflinger/pixel_format.h"
19#include "core/hle/service/nvflinger/status.h" 19#include "core/hle/service/nvnflinger/status.h"
20#include "core/hle/service/nvflinger/window.h" 20#include "core/hle/service/nvnflinger/window.h"
21 21
22namespace Service::android { 22namespace Service::android {
23 23
diff --git a/src/core/hle/service/nvflinger/buffer_queue_defs.h b/src/core/hle/service/nvnflinger/buffer_queue_defs.h
index 334445213..6fd3156f4 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_defs.h
+++ b/src/core/hle/service/nvnflinger/buffer_queue_defs.h
@@ -9,7 +9,7 @@
9#include <array> 9#include <array>
10 10
11#include "common/common_types.h" 11#include "common/common_types.h"
12#include "core/hle/service/nvflinger/buffer_slot.h" 12#include "core/hle/service/nvnflinger/buffer_slot.h"
13 13
14namespace Service::android::BufferQueueDefs { 14namespace Service::android::BufferQueueDefs {
15 15
diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp
index ad73edd66..cd0a13094 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp
+++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp
@@ -14,12 +14,12 @@
14#include "core/hle/service/hle_ipc.h" 14#include "core/hle/service/hle_ipc.h"
15#include "core/hle/service/kernel_helpers.h" 15#include "core/hle/service/kernel_helpers.h"
16#include "core/hle/service/nvdrv/core/nvmap.h" 16#include "core/hle/service/nvdrv/core/nvmap.h"
17#include "core/hle/service/nvflinger/buffer_queue_core.h" 17#include "core/hle/service/nvnflinger/buffer_queue_core.h"
18#include "core/hle/service/nvflinger/buffer_queue_producer.h" 18#include "core/hle/service/nvnflinger/buffer_queue_producer.h"
19#include "core/hle/service/nvflinger/consumer_listener.h" 19#include "core/hle/service/nvnflinger/consumer_listener.h"
20#include "core/hle/service/nvflinger/parcel.h" 20#include "core/hle/service/nvnflinger/parcel.h"
21#include "core/hle/service/nvflinger/ui/graphic_buffer.h" 21#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"
22#include "core/hle/service/nvflinger/window.h" 22#include "core/hle/service/nvnflinger/window.h"
23#include "core/hle/service/vi/vi.h" 23#include "core/hle/service/vi/vi.h"
24 24
25namespace Service::android { 25namespace Service::android {
@@ -37,20 +37,20 @@ BufferQueueProducer::~BufferQueueProducer() {
37} 37}
38 38
39Status BufferQueueProducer::RequestBuffer(s32 slot, std::shared_ptr<GraphicBuffer>* buf) { 39Status BufferQueueProducer::RequestBuffer(s32 slot, std::shared_ptr<GraphicBuffer>* buf) {
40 LOG_DEBUG(Service_NVFlinger, "slot {}", slot); 40 LOG_DEBUG(Service_Nvnflinger, "slot {}", slot);
41 41
42 std::scoped_lock lock{core->mutex}; 42 std::scoped_lock lock{core->mutex};
43 43
44 if (core->is_abandoned) { 44 if (core->is_abandoned) {
45 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 45 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
46 return Status::NoInit; 46 return Status::NoInit;
47 } 47 }
48 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { 48 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) {
49 LOG_ERROR(Service_NVFlinger, "slot index {} out of range [0, {})", slot, 49 LOG_ERROR(Service_Nvnflinger, "slot index {} out of range [0, {})", slot,
50 BufferQueueDefs::NUM_BUFFER_SLOTS); 50 BufferQueueDefs::NUM_BUFFER_SLOTS);
51 return Status::BadValue; 51 return Status::BadValue;
52 } else if (slots[slot].buffer_state != BufferState::Dequeued) { 52 } else if (slots[slot].buffer_state != BufferState::Dequeued) {
53 LOG_ERROR(Service_NVFlinger, "slot {} is not owned by the producer (state = {})", slot, 53 LOG_ERROR(Service_Nvnflinger, "slot {} is not owned by the producer (state = {})", slot,
54 slots[slot].buffer_state); 54 slots[slot].buffer_state);
55 return Status::BadValue; 55 return Status::BadValue;
56 } 56 }
@@ -62,7 +62,7 @@ Status BufferQueueProducer::RequestBuffer(s32 slot, std::shared_ptr<GraphicBuffe
62} 62}
63 63
64Status BufferQueueProducer::SetBufferCount(s32 buffer_count) { 64Status BufferQueueProducer::SetBufferCount(s32 buffer_count) {
65 LOG_DEBUG(Service_NVFlinger, "count = {}", buffer_count); 65 LOG_DEBUG(Service_Nvnflinger, "count = {}", buffer_count);
66 66
67 std::shared_ptr<IConsumerListener> listener; 67 std::shared_ptr<IConsumerListener> listener;
68 { 68 {
@@ -70,12 +70,12 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) {
70 core->WaitWhileAllocatingLocked(); 70 core->WaitWhileAllocatingLocked();
71 71
72 if (core->is_abandoned) { 72 if (core->is_abandoned) {
73 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 73 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
74 return Status::NoInit; 74 return Status::NoInit;
75 } 75 }
76 76
77 if (buffer_count > BufferQueueDefs::NUM_BUFFER_SLOTS) { 77 if (buffer_count > BufferQueueDefs::NUM_BUFFER_SLOTS) {
78 LOG_ERROR(Service_NVFlinger, "buffer_count {} too large (max {})", buffer_count, 78 LOG_ERROR(Service_Nvnflinger, "buffer_count {} too large (max {})", buffer_count,
79 BufferQueueDefs::NUM_BUFFER_SLOTS); 79 BufferQueueDefs::NUM_BUFFER_SLOTS);
80 return Status::BadValue; 80 return Status::BadValue;
81 } 81 }
@@ -83,7 +83,7 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) {
83 // There must be no dequeued buffers when changing the buffer count. 83 // There must be no dequeued buffers when changing the buffer count.
84 for (s32 s{}; s < BufferQueueDefs::NUM_BUFFER_SLOTS; ++s) { 84 for (s32 s{}; s < BufferQueueDefs::NUM_BUFFER_SLOTS; ++s) {
85 if (slots[s].buffer_state == BufferState::Dequeued) { 85 if (slots[s].buffer_state == BufferState::Dequeued) {
86 LOG_ERROR(Service_NVFlinger, "buffer owned by producer"); 86 LOG_ERROR(Service_Nvnflinger, "buffer owned by producer");
87 return Status::BadValue; 87 return Status::BadValue;
88 } 88 }
89 } 89 }
@@ -96,7 +96,7 @@ Status BufferQueueProducer::SetBufferCount(s32 buffer_count) {
96 96
97 const s32 min_buffer_slots = core->GetMinMaxBufferCountLocked(false); 97 const s32 min_buffer_slots = core->GetMinMaxBufferCountLocked(false);
98 if (buffer_count < min_buffer_slots) { 98 if (buffer_count < min_buffer_slots) {
99 LOG_ERROR(Service_NVFlinger, "requested buffer count {} is less than minimum {}", 99 LOG_ERROR(Service_Nvnflinger, "requested buffer count {} is less than minimum {}",
100 buffer_count, min_buffer_slots); 100 buffer_count, min_buffer_slots);
101 return Status::BadValue; 101 return Status::BadValue;
102 } 102 }
@@ -127,14 +127,14 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St
127 127
128 while (try_again) { 128 while (try_again) {
129 if (core->is_abandoned) { 129 if (core->is_abandoned) {
130 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 130 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
131 return Status::NoInit; 131 return Status::NoInit;
132 } 132 }
133 133
134 const s32 max_buffer_count = core->GetMaxBufferCountLocked(async); 134 const s32 max_buffer_count = core->GetMaxBufferCountLocked(async);
135 if (async && core->override_max_buffer_count) { 135 if (async && core->override_max_buffer_count) {
136 if (core->override_max_buffer_count < max_buffer_count) { 136 if (core->override_max_buffer_count < max_buffer_count) {
137 LOG_ERROR(Service_NVFlinger, "async mode is invalid with buffer count override"); 137 LOG_ERROR(Service_Nvnflinger, "async mode is invalid with buffer count override");
138 return Status::BadValue; 138 return Status::BadValue;
139 } 139 }
140 } 140 }
@@ -176,7 +176,7 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St
176 // Producers are not allowed to dequeue more than one buffer if they did not set a buffer 176 // Producers are not allowed to dequeue more than one buffer if they did not set a buffer
177 // count 177 // count
178 if (!core->override_max_buffer_count && dequeued_count) { 178 if (!core->override_max_buffer_count && dequeued_count) {
179 LOG_ERROR(Service_NVFlinger, 179 LOG_ERROR(Service_Nvnflinger,
180 "can't dequeue multiple buffers without setting the buffer count"); 180 "can't dequeue multiple buffers without setting the buffer count");
181 return Status::InvalidOperation; 181 return Status::InvalidOperation;
182 } 182 }
@@ -188,7 +188,7 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St
188 const s32 new_undequeued_count = max_buffer_count - (dequeued_count + 1); 188 const s32 new_undequeued_count = max_buffer_count - (dequeued_count + 1);
189 const s32 min_undequeued_count = core->GetMinUndequeuedBufferCountLocked(async); 189 const s32 min_undequeued_count = core->GetMinUndequeuedBufferCountLocked(async);
190 if (new_undequeued_count < min_undequeued_count) { 190 if (new_undequeued_count < min_undequeued_count) {
191 LOG_ERROR(Service_NVFlinger, 191 LOG_ERROR(Service_Nvnflinger,
192 "min undequeued buffer count({}) exceeded (dequeued={} undequeued={})", 192 "min undequeued buffer count({}) exceeded (dequeued={} undequeued={})",
193 min_undequeued_count, dequeued_count, new_undequeued_count); 193 min_undequeued_count, dequeued_count, new_undequeued_count);
194 return Status::InvalidOperation; 194 return Status::InvalidOperation;
@@ -200,7 +200,7 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St
200 // outrun the consumer. Wait here if it looks like we have too many buffers queued up. 200 // outrun the consumer. Wait here if it looks like we have too many buffers queued up.
201 const bool too_many_buffers = core->queue.size() > static_cast<size_t>(max_buffer_count); 201 const bool too_many_buffers = core->queue.size() > static_cast<size_t>(max_buffer_count);
202 if (too_many_buffers) { 202 if (too_many_buffers) {
203 LOG_ERROR(Service_NVFlinger, "queue size is {}, waiting", core->queue.size()); 203 LOG_ERROR(Service_Nvnflinger, "queue size is {}, waiting", core->queue.size());
204 } 204 }
205 205
206 // If no buffer is found, or if the queue has too many buffers outstanding, wait for a 206 // If no buffer is found, or if the queue has too many buffers outstanding, wait for a
@@ -226,11 +226,11 @@ Status BufferQueueProducer::WaitForFreeSlotThenRelock(bool async, s32* found, St
226 226
227Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool async, u32 width, 227Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool async, u32 width,
228 u32 height, PixelFormat format, u32 usage) { 228 u32 height, PixelFormat format, u32 usage) {
229 LOG_DEBUG(Service_NVFlinger, "async={} w={} h={} format={}, usage={}", async ? "true" : "false", 229 LOG_DEBUG(Service_Nvnflinger, "async={} w={} h={} format={}, usage={}",
230 width, height, format, usage); 230 async ? "true" : "false", width, height, format, usage);
231 231
232 if ((width != 0 && height == 0) || (width == 0 && height != 0)) { 232 if ((width != 0 && height == 0) || (width == 0 && height != 0)) {
233 LOG_ERROR(Service_NVFlinger, "invalid size: w={} h={}", width, height); 233 LOG_ERROR(Service_Nvnflinger, "invalid size: w={} h={}", width, height);
234 return Status::BadValue; 234 return Status::BadValue;
235 } 235 }
236 236
@@ -255,7 +255,7 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool
255 255
256 // This should not happen 256 // This should not happen
257 if (found == BufferQueueCore::INVALID_BUFFER_SLOT) { 257 if (found == BufferQueueCore::INVALID_BUFFER_SLOT) {
258 LOG_ERROR(Service_NVFlinger, "no available buffer slots"); 258 LOG_ERROR(Service_Nvnflinger, "no available buffer slots");
259 return Status::Busy; 259 return Status::Busy;
260 } 260 }
261 261
@@ -287,11 +287,11 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool
287 } 287 }
288 288
289 if ((return_flags & Status::BufferNeedsReallocation) != Status::None) { 289 if ((return_flags & Status::BufferNeedsReallocation) != Status::None) {
290 LOG_DEBUG(Service_NVFlinger, "allocating a new buffer for slot {}", *out_slot); 290 LOG_DEBUG(Service_Nvnflinger, "allocating a new buffer for slot {}", *out_slot);
291 291
292 auto graphic_buffer = std::make_shared<GraphicBuffer>(width, height, format, usage); 292 auto graphic_buffer = std::make_shared<GraphicBuffer>(width, height, format, usage);
293 if (graphic_buffer == nullptr) { 293 if (graphic_buffer == nullptr) {
294 LOG_ERROR(Service_NVFlinger, "creating GraphicBuffer failed"); 294 LOG_ERROR(Service_Nvnflinger, "creating GraphicBuffer failed");
295 return Status::NoMemory; 295 return Status::NoMemory;
296 } 296 }
297 297
@@ -299,7 +299,7 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool
299 std::scoped_lock lock{core->mutex}; 299 std::scoped_lock lock{core->mutex};
300 300
301 if (core->is_abandoned) { 301 if (core->is_abandoned) {
302 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 302 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
303 return Status::NoInit; 303 return Status::NoInit;
304 } 304 }
305 305
@@ -312,32 +312,32 @@ Status BufferQueueProducer::DequeueBuffer(s32* out_slot, Fence* out_fence, bool
312 return_flags |= Status::BufferNeedsReallocation; 312 return_flags |= Status::BufferNeedsReallocation;
313 } 313 }
314 314
315 LOG_DEBUG(Service_NVFlinger, "returning slot={} frame={}, flags={}", *out_slot, 315 LOG_DEBUG(Service_Nvnflinger, "returning slot={} frame={}, flags={}", *out_slot,
316 slots[*out_slot].frame_number, return_flags); 316 slots[*out_slot].frame_number, return_flags);
317 317
318 return return_flags; 318 return return_flags;
319} 319}
320 320
321Status BufferQueueProducer::DetachBuffer(s32 slot) { 321Status BufferQueueProducer::DetachBuffer(s32 slot) {
322 LOG_DEBUG(Service_NVFlinger, "slot {}", slot); 322 LOG_DEBUG(Service_Nvnflinger, "slot {}", slot);
323 323
324 std::scoped_lock lock{core->mutex}; 324 std::scoped_lock lock{core->mutex};
325 325
326 if (core->is_abandoned) { 326 if (core->is_abandoned) {
327 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 327 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
328 return Status::NoInit; 328 return Status::NoInit;
329 } 329 }
330 330
331 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { 331 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) {
332 LOG_ERROR(Service_NVFlinger, "slot {} out of range [0, {})", slot, 332 LOG_ERROR(Service_Nvnflinger, "slot {} out of range [0, {})", slot,
333 BufferQueueDefs::NUM_BUFFER_SLOTS); 333 BufferQueueDefs::NUM_BUFFER_SLOTS);
334 return Status::BadValue; 334 return Status::BadValue;
335 } else if (slots[slot].buffer_state != BufferState::Dequeued) { 335 } else if (slots[slot].buffer_state != BufferState::Dequeued) {
336 LOG_ERROR(Service_NVFlinger, "slot {} is not owned by the producer (state = {})", slot, 336 LOG_ERROR(Service_Nvnflinger, "slot {} is not owned by the producer (state = {})", slot,
337 slots[slot].buffer_state); 337 slots[slot].buffer_state);
338 return Status::BadValue; 338 return Status::BadValue;
339 } else if (!slots[slot].request_buffer_called) { 339 } else if (!slots[slot].request_buffer_called) {
340 LOG_ERROR(Service_NVFlinger, "buffer in slot {} has not been requested", slot); 340 LOG_ERROR(Service_Nvnflinger, "buffer in slot {} has not been requested", slot);
341 return Status::BadValue; 341 return Status::BadValue;
342 } 342 }
343 343
@@ -350,10 +350,10 @@ Status BufferQueueProducer::DetachBuffer(s32 slot) {
350Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr<GraphicBuffer>* out_buffer, 350Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr<GraphicBuffer>* out_buffer,
351 Fence* out_fence) { 351 Fence* out_fence) {
352 if (out_buffer == nullptr) { 352 if (out_buffer == nullptr) {
353 LOG_ERROR(Service_NVFlinger, "out_buffer must not be nullptr"); 353 LOG_ERROR(Service_Nvnflinger, "out_buffer must not be nullptr");
354 return Status::BadValue; 354 return Status::BadValue;
355 } else if (out_fence == nullptr) { 355 } else if (out_fence == nullptr) {
356 LOG_ERROR(Service_NVFlinger, "out_fence must not be nullptr"); 356 LOG_ERROR(Service_Nvnflinger, "out_fence must not be nullptr");
357 return Status::BadValue; 357 return Status::BadValue;
358 } 358 }
359 359
@@ -361,7 +361,7 @@ Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr<GraphicBuffer>* out
361 core->WaitWhileAllocatingLocked(); 361 core->WaitWhileAllocatingLocked();
362 362
363 if (core->is_abandoned) { 363 if (core->is_abandoned) {
364 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 364 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
365 return Status::NoInit; 365 return Status::NoInit;
366 } 366 }
367 367
@@ -380,7 +380,7 @@ Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr<GraphicBuffer>* out
380 return Status::NoMemory; 380 return Status::NoMemory;
381 } 381 }
382 382
383 LOG_DEBUG(Service_NVFlinger, "Detached slot {}", found); 383 LOG_DEBUG(Service_Nvnflinger, "Detached slot {}", found);
384 384
385 *out_buffer = slots[found].graphic_buffer; 385 *out_buffer = slots[found].graphic_buffer;
386 *out_fence = slots[found].fence; 386 *out_fence = slots[found].fence;
@@ -393,10 +393,10 @@ Status BufferQueueProducer::DetachNextBuffer(std::shared_ptr<GraphicBuffer>* out
393Status BufferQueueProducer::AttachBuffer(s32* out_slot, 393Status BufferQueueProducer::AttachBuffer(s32* out_slot,
394 const std::shared_ptr<GraphicBuffer>& buffer) { 394 const std::shared_ptr<GraphicBuffer>& buffer) {
395 if (out_slot == nullptr) { 395 if (out_slot == nullptr) {
396 LOG_ERROR(Service_NVFlinger, "out_slot must not be nullptr"); 396 LOG_ERROR(Service_Nvnflinger, "out_slot must not be nullptr");
397 return Status::BadValue; 397 return Status::BadValue;
398 } else if (buffer == nullptr) { 398 } else if (buffer == nullptr) {
399 LOG_ERROR(Service_NVFlinger, "Cannot attach nullptr buffer"); 399 LOG_ERROR(Service_Nvnflinger, "Cannot attach nullptr buffer");
400 return Status::BadValue; 400 return Status::BadValue;
401 } 401 }
402 402
@@ -413,13 +413,13 @@ Status BufferQueueProducer::AttachBuffer(s32* out_slot,
413 413
414 // This should not happen 414 // This should not happen
415 if (found == BufferQueueCore::INVALID_BUFFER_SLOT) { 415 if (found == BufferQueueCore::INVALID_BUFFER_SLOT) {
416 LOG_ERROR(Service_NVFlinger, "No available buffer slots"); 416 LOG_ERROR(Service_Nvnflinger, "No available buffer slots");
417 return Status::Busy; 417 return Status::Busy;
418 } 418 }
419 419
420 *out_slot = found; 420 *out_slot = found;
421 421
422 LOG_DEBUG(Service_NVFlinger, "Returning slot {} flags={}", *out_slot, return_flags); 422 LOG_DEBUG(Service_Nvnflinger, "Returning slot {} flags={}", *out_slot, return_flags);
423 423
424 slots[*out_slot].graphic_buffer = buffer; 424 slots[*out_slot].graphic_buffer = buffer;
425 slots[*out_slot].buffer_state = BufferState::Dequeued; 425 slots[*out_slot].buffer_state = BufferState::Dequeued;
@@ -451,7 +451,7 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input,
451 case NativeWindowScalingMode::NoScaleCrop: 451 case NativeWindowScalingMode::NoScaleCrop:
452 break; 452 break;
453 default: 453 default:
454 LOG_ERROR(Service_NVFlinger, "unknown scaling mode {}", scaling_mode); 454 LOG_ERROR(Service_Nvnflinger, "unknown scaling mode {}", scaling_mode);
455 return Status::BadValue; 455 return Status::BadValue;
456 } 456 }
457 457
@@ -464,38 +464,38 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input,
464 std::scoped_lock lock{core->mutex}; 464 std::scoped_lock lock{core->mutex};
465 465
466 if (core->is_abandoned) { 466 if (core->is_abandoned) {
467 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 467 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
468 return Status::NoInit; 468 return Status::NoInit;
469 } 469 }
470 470
471 const s32 max_buffer_count = core->GetMaxBufferCountLocked(async); 471 const s32 max_buffer_count = core->GetMaxBufferCountLocked(async);
472 if (async && core->override_max_buffer_count) { 472 if (async && core->override_max_buffer_count) {
473 if (core->override_max_buffer_count < max_buffer_count) { 473 if (core->override_max_buffer_count < max_buffer_count) {
474 LOG_ERROR(Service_NVFlinger, "async mode is invalid with " 474 LOG_ERROR(Service_Nvnflinger, "async mode is invalid with "
475 "buffer count override"); 475 "buffer count override");
476 return Status::BadValue; 476 return Status::BadValue;
477 } 477 }
478 } 478 }
479 479
480 if (slot < 0 || slot >= max_buffer_count) { 480 if (slot < 0 || slot >= max_buffer_count) {
481 LOG_ERROR(Service_NVFlinger, "slot index {} out of range [0, {})", slot, 481 LOG_ERROR(Service_Nvnflinger, "slot index {} out of range [0, {})", slot,
482 max_buffer_count); 482 max_buffer_count);
483 return Status::BadValue; 483 return Status::BadValue;
484 } else if (slots[slot].buffer_state != BufferState::Dequeued) { 484 } else if (slots[slot].buffer_state != BufferState::Dequeued) {
485 LOG_ERROR(Service_NVFlinger, 485 LOG_ERROR(Service_Nvnflinger,
486 "slot {} is not owned by the producer " 486 "slot {} is not owned by the producer "
487 "(state = {})", 487 "(state = {})",
488 slot, slots[slot].buffer_state); 488 slot, slots[slot].buffer_state);
489 return Status::BadValue; 489 return Status::BadValue;
490 } else if (!slots[slot].request_buffer_called) { 490 } else if (!slots[slot].request_buffer_called) {
491 LOG_ERROR(Service_NVFlinger, 491 LOG_ERROR(Service_Nvnflinger,
492 "slot {} was queued without requesting " 492 "slot {} was queued without requesting "
493 "a buffer", 493 "a buffer",
494 slot); 494 slot);
495 return Status::BadValue; 495 return Status::BadValue;
496 } 496 }
497 497
498 LOG_DEBUG(Service_NVFlinger, 498 LOG_DEBUG(Service_Nvnflinger,
499 "slot={} frame={} time={} crop=[{},{},{},{}] transform={} scale={}", slot, 499 "slot={} frame={} time={} crop=[{},{},{},{}] transform={} scale={}", slot,
500 core->frame_counter + 1, timestamp, crop.Left(), crop.Top(), crop.Right(), 500 core->frame_counter + 1, timestamp, crop.Left(), crop.Top(), crop.Right(),
501 crop.Bottom(), transform, scaling_mode); 501 crop.Bottom(), transform, scaling_mode);
@@ -506,7 +506,7 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input,
506 [[maybe_unused]] const bool unused = crop.Intersect(buffer_rect, &cropped_rect); 506 [[maybe_unused]] const bool unused = crop.Intersect(buffer_rect, &cropped_rect);
507 507
508 if (cropped_rect != crop) { 508 if (cropped_rect != crop) {
509 LOG_ERROR(Service_NVFlinger, "crop rect is not contained within the buffer in slot {}", 509 LOG_ERROR(Service_Nvnflinger, "crop rect is not contained within the buffer in slot {}",
510 slot); 510 slot);
511 return Status::BadValue; 511 return Status::BadValue;
512 } 512 }
@@ -598,21 +598,21 @@ Status BufferQueueProducer::QueueBuffer(s32 slot, const QueueBufferInput& input,
598} 598}
599 599
600void BufferQueueProducer::CancelBuffer(s32 slot, const Fence& fence) { 600void BufferQueueProducer::CancelBuffer(s32 slot, const Fence& fence) {
601 LOG_DEBUG(Service_NVFlinger, "slot {}", slot); 601 LOG_DEBUG(Service_Nvnflinger, "slot {}", slot);
602 602
603 std::scoped_lock lock{core->mutex}; 603 std::scoped_lock lock{core->mutex};
604 604
605 if (core->is_abandoned) { 605 if (core->is_abandoned) {
606 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 606 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
607 return; 607 return;
608 } 608 }
609 609
610 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { 610 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) {
611 LOG_ERROR(Service_NVFlinger, "slot index {} out of range [0, {})", slot, 611 LOG_ERROR(Service_Nvnflinger, "slot index {} out of range [0, {})", slot,
612 BufferQueueDefs::NUM_BUFFER_SLOTS); 612 BufferQueueDefs::NUM_BUFFER_SLOTS);
613 return; 613 return;
614 } else if (slots[slot].buffer_state != BufferState::Dequeued) { 614 } else if (slots[slot].buffer_state != BufferState::Dequeued) {
615 LOG_ERROR(Service_NVFlinger, "slot {} is not owned by the producer (state = {})", slot, 615 LOG_ERROR(Service_Nvnflinger, "slot {} is not owned by the producer (state = {})", slot,
616 slots[slot].buffer_state); 616 slots[slot].buffer_state);
617 return; 617 return;
618 } 618 }
@@ -629,12 +629,12 @@ Status BufferQueueProducer::Query(NativeWindow what, s32* out_value) {
629 std::scoped_lock lock{core->mutex}; 629 std::scoped_lock lock{core->mutex};
630 630
631 if (out_value == nullptr) { 631 if (out_value == nullptr) {
632 LOG_ERROR(Service_NVFlinger, "outValue was nullptr"); 632 LOG_ERROR(Service_Nvnflinger, "outValue was nullptr");
633 return Status::BadValue; 633 return Status::BadValue;
634 } 634 }
635 635
636 if (core->is_abandoned) { 636 if (core->is_abandoned) {
637 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 637 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
638 return Status::NoInit; 638 return Status::NoInit;
639 } 639 }
640 640
@@ -666,7 +666,7 @@ Status BufferQueueProducer::Query(NativeWindow what, s32* out_value) {
666 return Status::BadValue; 666 return Status::BadValue;
667 } 667 }
668 668
669 LOG_DEBUG(Service_NVFlinger, "what = {}, value = {}", what, value); 669 LOG_DEBUG(Service_Nvnflinger, "what = {}, value = {}", what, value);
670 670
671 *out_value = static_cast<s32>(value); 671 *out_value = static_cast<s32>(value);
672 672
@@ -678,26 +678,26 @@ Status BufferQueueProducer::Connect(const std::shared_ptr<IProducerListener>& li
678 QueueBufferOutput* output) { 678 QueueBufferOutput* output) {
679 std::scoped_lock lock{core->mutex}; 679 std::scoped_lock lock{core->mutex};
680 680
681 LOG_DEBUG(Service_NVFlinger, "api = {} producer_controlled_by_app = {}", api, 681 LOG_DEBUG(Service_Nvnflinger, "api = {} producer_controlled_by_app = {}", api,
682 producer_controlled_by_app); 682 producer_controlled_by_app);
683 683
684 if (core->is_abandoned) { 684 if (core->is_abandoned) {
685 LOG_ERROR(Service_NVFlinger, "BufferQueue has been abandoned"); 685 LOG_ERROR(Service_Nvnflinger, "BufferQueue has been abandoned");
686 return Status::NoInit; 686 return Status::NoInit;
687 } 687 }
688 688
689 if (core->consumer_listener == nullptr) { 689 if (core->consumer_listener == nullptr) {
690 LOG_ERROR(Service_NVFlinger, "BufferQueue has no consumer"); 690 LOG_ERROR(Service_Nvnflinger, "BufferQueue has no consumer");
691 return Status::NoInit; 691 return Status::NoInit;
692 } 692 }
693 693
694 if (output == nullptr) { 694 if (output == nullptr) {
695 LOG_ERROR(Service_NVFlinger, "output was nullptr"); 695 LOG_ERROR(Service_Nvnflinger, "output was nullptr");
696 return Status::BadValue; 696 return Status::BadValue;
697 } 697 }
698 698
699 if (core->connected_api != NativeWindowApi::NoConnectedApi) { 699 if (core->connected_api != NativeWindowApi::NoConnectedApi) {
700 LOG_ERROR(Service_NVFlinger, "already connected (cur = {} req = {})", core->connected_api, 700 LOG_ERROR(Service_Nvnflinger, "already connected (cur = {} req = {})", core->connected_api,
701 api); 701 api);
702 return Status::BadValue; 702 return Status::BadValue;
703 } 703 }
@@ -714,7 +714,7 @@ Status BufferQueueProducer::Connect(const std::shared_ptr<IProducerListener>& li
714 core->connected_producer_listener = listener; 714 core->connected_producer_listener = listener;
715 break; 715 break;
716 default: 716 default:
717 LOG_ERROR(Service_NVFlinger, "unknown api = {}", api); 717 LOG_ERROR(Service_Nvnflinger, "unknown api = {}", api);
718 status = Status::BadValue; 718 status = Status::BadValue;
719 break; 719 break;
720 } 720 }
@@ -727,7 +727,7 @@ Status BufferQueueProducer::Connect(const std::shared_ptr<IProducerListener>& li
727} 727}
728 728
729Status BufferQueueProducer::Disconnect(NativeWindowApi api) { 729Status BufferQueueProducer::Disconnect(NativeWindowApi api) {
730 LOG_DEBUG(Service_NVFlinger, "api = {}", api); 730 LOG_DEBUG(Service_Nvnflinger, "api = {}", api);
731 731
732 Status status = Status::NoError; 732 Status status = Status::NoError;
733 std::shared_ptr<IConsumerListener> listener; 733 std::shared_ptr<IConsumerListener> listener;
@@ -762,13 +762,13 @@ Status BufferQueueProducer::Disconnect(NativeWindowApi api) {
762 buffer_wait_event->Signal(); 762 buffer_wait_event->Signal();
763 listener = core->consumer_listener; 763 listener = core->consumer_listener;
764 } else { 764 } else {
765 LOG_ERROR(Service_NVFlinger, "still connected to another api (cur = {} req = {})", 765 LOG_ERROR(Service_Nvnflinger, "still connected to another api (cur = {} req = {})",
766 core->connected_api, api); 766 core->connected_api, api);
767 status = Status::BadValue; 767 status = Status::BadValue;
768 } 768 }
769 break; 769 break;
770 default: 770 default:
771 LOG_ERROR(Service_NVFlinger, "unknown api = {}", api); 771 LOG_ERROR(Service_Nvnflinger, "unknown api = {}", api);
772 status = Status::BadValue; 772 status = Status::BadValue;
773 break; 773 break;
774 } 774 }
@@ -784,7 +784,7 @@ Status BufferQueueProducer::Disconnect(NativeWindowApi api) {
784 784
785Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot, 785Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot,
786 const std::shared_ptr<GraphicBuffer>& buffer) { 786 const std::shared_ptr<GraphicBuffer>& buffer) {
787 LOG_DEBUG(Service_NVFlinger, "slot {}", slot); 787 LOG_DEBUG(Service_Nvnflinger, "slot {}", slot);
788 788
789 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { 789 if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) {
790 return Status::BadValue; 790 return Status::BadValue;
@@ -914,7 +914,7 @@ void BufferQueueProducer::Transact(HLERequestContext& ctx, TransactionId code, u
914 break; 914 break;
915 } 915 }
916 case TransactionId::GetBufferHistory: 916 case TransactionId::GetBufferHistory:
917 LOG_WARNING(Service_NVFlinger, "(STUBBED) called, transaction=GetBufferHistory"); 917 LOG_WARNING(Service_Nvnflinger, "(STUBBED) called, transaction=GetBufferHistory");
918 break; 918 break;
919 default: 919 default:
920 ASSERT_MSG(false, "Unimplemented TransactionId {}", code); 920 ASSERT_MSG(false, "Unimplemented TransactionId {}", code);
diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.h b/src/core/hle/service/nvnflinger/buffer_queue_producer.h
index 16189fa6f..d4201c104 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_producer.h
+++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.h
@@ -12,13 +12,13 @@
12 12
13#include "common/common_funcs.h" 13#include "common/common_funcs.h"
14#include "core/hle/service/nvdrv/nvdata.h" 14#include "core/hle/service/nvdrv/nvdata.h"
15#include "core/hle/service/nvflinger/binder.h" 15#include "core/hle/service/nvnflinger/binder.h"
16#include "core/hle/service/nvflinger/buffer_queue_defs.h" 16#include "core/hle/service/nvnflinger/buffer_queue_defs.h"
17#include "core/hle/service/nvflinger/buffer_slot.h" 17#include "core/hle/service/nvnflinger/buffer_slot.h"
18#include "core/hle/service/nvflinger/graphic_buffer_producer.h" 18#include "core/hle/service/nvnflinger/graphic_buffer_producer.h"
19#include "core/hle/service/nvflinger/pixel_format.h" 19#include "core/hle/service/nvnflinger/pixel_format.h"
20#include "core/hle/service/nvflinger/status.h" 20#include "core/hle/service/nvnflinger/status.h"
21#include "core/hle/service/nvflinger/window.h" 21#include "core/hle/service/nvnflinger/window.h"
22 22
23namespace Kernel { 23namespace Kernel {
24class KernelCore; 24class KernelCore;
diff --git a/src/core/hle/service/nvflinger/buffer_slot.h b/src/core/hle/service/nvnflinger/buffer_slot.h
index 0cd0e9964..d25bca049 100644
--- a/src/core/hle/service/nvflinger/buffer_slot.h
+++ b/src/core/hle/service/nvnflinger/buffer_slot.h
@@ -9,7 +9,7 @@
9#include <memory> 9#include <memory>
10 10
11#include "common/common_types.h" 11#include "common/common_types.h"
12#include "core/hle/service/nvflinger/ui/fence.h" 12#include "core/hle/service/nvnflinger/ui/fence.h"
13 13
14namespace Service::android { 14namespace Service::android {
15 15
diff --git a/src/core/hle/service/nvflinger/buffer_transform_flags.h b/src/core/hle/service/nvnflinger/buffer_transform_flags.h
index 67aa5dad6..67aa5dad6 100644
--- a/src/core/hle/service/nvflinger/buffer_transform_flags.h
+++ b/src/core/hle/service/nvnflinger/buffer_transform_flags.h
diff --git a/src/core/hle/service/nvflinger/consumer_base.cpp b/src/core/hle/service/nvnflinger/consumer_base.cpp
index 982531e2d..4dcda8dac 100644
--- a/src/core/hle/service/nvflinger/consumer_base.cpp
+++ b/src/core/hle/service/nvnflinger/consumer_base.cpp
@@ -6,11 +6,11 @@
6 6
7#include "common/assert.h" 7#include "common/assert.h"
8#include "common/logging/log.h" 8#include "common/logging/log.h"
9#include "core/hle/service/nvflinger/buffer_item.h" 9#include "core/hle/service/nvnflinger/buffer_item.h"
10#include "core/hle/service/nvflinger/buffer_queue_consumer.h" 10#include "core/hle/service/nvnflinger/buffer_queue_consumer.h"
11#include "core/hle/service/nvflinger/buffer_queue_core.h" 11#include "core/hle/service/nvnflinger/buffer_queue_core.h"
12#include "core/hle/service/nvflinger/consumer_base.h" 12#include "core/hle/service/nvnflinger/consumer_base.h"
13#include "core/hle/service/nvflinger/ui/graphic_buffer.h" 13#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"
14 14
15namespace Service::android { 15namespace Service::android {
16 16
@@ -28,7 +28,7 @@ void ConsumerBase::Connect(bool controlled_by_app) {
28} 28}
29 29
30void ConsumerBase::FreeBufferLocked(s32 slot_index) { 30void ConsumerBase::FreeBufferLocked(s32 slot_index) {
31 LOG_DEBUG(Service_NVFlinger, "slot_index={}", slot_index); 31 LOG_DEBUG(Service_Nvnflinger, "slot_index={}", slot_index);
32 32
33 slots[slot_index].graphic_buffer = nullptr; 33 slots[slot_index].graphic_buffer = nullptr;
34 slots[slot_index].fence = Fence::NoFence(); 34 slots[slot_index].fence = Fence::NoFence();
@@ -36,17 +36,17 @@ void ConsumerBase::FreeBufferLocked(s32 slot_index) {
36} 36}
37 37
38void ConsumerBase::OnFrameAvailable(const BufferItem& item) { 38void ConsumerBase::OnFrameAvailable(const BufferItem& item) {
39 LOG_DEBUG(Service_NVFlinger, "called"); 39 LOG_DEBUG(Service_Nvnflinger, "called");
40} 40}
41 41
42void ConsumerBase::OnFrameReplaced(const BufferItem& item) { 42void ConsumerBase::OnFrameReplaced(const BufferItem& item) {
43 LOG_DEBUG(Service_NVFlinger, "called"); 43 LOG_DEBUG(Service_Nvnflinger, "called");
44} 44}
45 45
46void ConsumerBase::OnBuffersReleased() { 46void ConsumerBase::OnBuffersReleased() {
47 std::scoped_lock lock{mutex}; 47 std::scoped_lock lock{mutex};
48 48
49 LOG_DEBUG(Service_NVFlinger, "called"); 49 LOG_DEBUG(Service_Nvnflinger, "called");
50 50
51 if (is_abandoned) { 51 if (is_abandoned) {
52 // Nothing to do if we're already abandoned. 52 // Nothing to do if we're already abandoned.
@@ -77,7 +77,7 @@ Status ConsumerBase::AcquireBufferLocked(BufferItem* item, std::chrono::nanoseco
77 slots[item->slot].frame_number = item->frame_number; 77 slots[item->slot].frame_number = item->frame_number;
78 slots[item->slot].fence = item->fence; 78 slots[item->slot].fence = item->fence;
79 79
80 LOG_DEBUG(Service_NVFlinger, "slot={}", item->slot); 80 LOG_DEBUG(Service_Nvnflinger, "slot={}", item->slot);
81 81
82 return Status::NoError; 82 return Status::NoError;
83} 83}
@@ -85,7 +85,7 @@ Status ConsumerBase::AcquireBufferLocked(BufferItem* item, std::chrono::nanoseco
85Status ConsumerBase::AddReleaseFenceLocked(s32 slot, 85Status ConsumerBase::AddReleaseFenceLocked(s32 slot,
86 const std::shared_ptr<GraphicBuffer>& graphic_buffer, 86 const std::shared_ptr<GraphicBuffer>& graphic_buffer,
87 const Fence& fence) { 87 const Fence& fence) {
88 LOG_DEBUG(Service_NVFlinger, "slot={}", slot); 88 LOG_DEBUG(Service_Nvnflinger, "slot={}", slot);
89 89
90 // If consumer no longer tracks this graphic_buffer, we can safely 90 // If consumer no longer tracks this graphic_buffer, we can safely
91 // drop this fence, as it will never be received by the producer. 91 // drop this fence, as it will never be received by the producer.
@@ -109,7 +109,7 @@ Status ConsumerBase::ReleaseBufferLocked(s32 slot,
109 return Status::NoError; 109 return Status::NoError;
110 } 110 }
111 111
112 LOG_DEBUG(Service_NVFlinger, "slot={}", slot); 112 LOG_DEBUG(Service_Nvnflinger, "slot={}", slot);
113 Status err = consumer->ReleaseBuffer(slot, slots[slot].frame_number, slots[slot].fence); 113 Status err = consumer->ReleaseBuffer(slot, slots[slot].frame_number, slots[slot].fence);
114 if (err == Status::StaleBufferSlot) { 114 if (err == Status::StaleBufferSlot) {
115 FreeBufferLocked(slot); 115 FreeBufferLocked(slot);
diff --git a/src/core/hle/service/nvflinger/consumer_base.h b/src/core/hle/service/nvnflinger/consumer_base.h
index 9a8a5f6bb..264829414 100644
--- a/src/core/hle/service/nvflinger/consumer_base.h
+++ b/src/core/hle/service/nvnflinger/consumer_base.h
@@ -12,9 +12,9 @@
12#include <mutex> 12#include <mutex>
13 13
14#include "common/common_types.h" 14#include "common/common_types.h"
15#include "core/hle/service/nvflinger/buffer_queue_defs.h" 15#include "core/hle/service/nvnflinger/buffer_queue_defs.h"
16#include "core/hle/service/nvflinger/consumer_listener.h" 16#include "core/hle/service/nvnflinger/consumer_listener.h"
17#include "core/hle/service/nvflinger/status.h" 17#include "core/hle/service/nvnflinger/status.h"
18 18
19namespace Service::android { 19namespace Service::android {
20 20
diff --git a/src/core/hle/service/nvflinger/consumer_listener.h b/src/core/hle/service/nvnflinger/consumer_listener.h
index 74a193988..74a193988 100644
--- a/src/core/hle/service/nvflinger/consumer_listener.h
+++ b/src/core/hle/service/nvnflinger/consumer_listener.h
diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp b/src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp
index 769e8c0a3..d72b49a8e 100644
--- a/src/core/hle/service/nvflinger/graphic_buffer_producer.cpp
+++ b/src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp
@@ -4,8 +4,8 @@
4// Parts of this implementation were based on: 4// Parts of this implementation were based on:
5// https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/IGraphicBufferProducer.cpp 5// https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/IGraphicBufferProducer.cpp
6 6
7#include "core/hle/service/nvflinger/graphic_buffer_producer.h" 7#include "core/hle/service/nvnflinger/graphic_buffer_producer.h"
8#include "core/hle/service/nvflinger/parcel.h" 8#include "core/hle/service/nvnflinger/parcel.h"
9 9
10namespace Service::android { 10namespace Service::android {
11 11
diff --git a/src/core/hle/service/nvflinger/graphic_buffer_producer.h b/src/core/hle/service/nvnflinger/graphic_buffer_producer.h
index 2969f0fd5..21d7b31f3 100644
--- a/src/core/hle/service/nvflinger/graphic_buffer_producer.h
+++ b/src/core/hle/service/nvnflinger/graphic_buffer_producer.h
@@ -9,8 +9,8 @@
9#include "common/common_funcs.h" 9#include "common/common_funcs.h"
10#include "common/common_types.h" 10#include "common/common_types.h"
11#include "common/math_util.h" 11#include "common/math_util.h"
12#include "core/hle/service/nvflinger/ui/fence.h" 12#include "core/hle/service/nvnflinger/ui/fence.h"
13#include "core/hle/service/nvflinger/window.h" 13#include "core/hle/service/nvnflinger/window.h"
14 14
15namespace Service::android { 15namespace Service::android {
16 16
diff --git a/src/core/hle/service/nvflinger/hos_binder_driver_server.cpp b/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp
index dc9b2a9ec..b86a79ec9 100644
--- a/src/core/hle/service/nvflinger/hos_binder_driver_server.cpp
+++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp
@@ -4,9 +4,9 @@
4#include <mutex> 4#include <mutex>
5 5
6#include "common/common_types.h" 6#include "common/common_types.h"
7#include "core/hle/service/nvflinger/hos_binder_driver_server.h" 7#include "core/hle/service/nvnflinger/hos_binder_driver_server.h"
8 8
9namespace Service::NVFlinger { 9namespace Service::Nvnflinger {
10 10
11HosBinderDriverServer::HosBinderDriverServer(Core::System& system_) 11HosBinderDriverServer::HosBinderDriverServer(Core::System& system_)
12 : service_context(system_, "HosBinderDriverServer") {} 12 : service_context(system_, "HosBinderDriverServer") {}
@@ -33,4 +33,4 @@ android::IBinder* HosBinderDriverServer::TryGetProducer(u64 id) {
33 return {}; 33 return {};
34} 34}
35 35
36} // namespace Service::NVFlinger 36} // namespace Service::Nvnflinger
diff --git a/src/core/hle/service/nvflinger/hos_binder_driver_server.h b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h
index 8fddc1206..58bb9469a 100644
--- a/src/core/hle/service/nvflinger/hos_binder_driver_server.h
+++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h
@@ -9,13 +9,13 @@
9 9
10#include "common/common_types.h" 10#include "common/common_types.h"
11#include "core/hle/service/kernel_helpers.h" 11#include "core/hle/service/kernel_helpers.h"
12#include "core/hle/service/nvflinger/binder.h" 12#include "core/hle/service/nvnflinger/binder.h"
13 13
14namespace Core { 14namespace Core {
15class System; 15class System;
16} 16}
17 17
18namespace Service::NVFlinger { 18namespace Service::Nvnflinger {
19 19
20class HosBinderDriverServer final { 20class HosBinderDriverServer final {
21public: 21public:
@@ -34,4 +34,4 @@ private:
34 u64 last_id{}; 34 u64 last_id{};
35}; 35};
36 36
37} // namespace Service::NVFlinger 37} // namespace Service::Nvnflinger
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvnflinger/nvnflinger.cpp
index f4416f5b2..4988e6e17 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp
@@ -15,11 +15,11 @@
15#include "core/hle/kernel/k_readable_event.h" 15#include "core/hle/kernel/k_readable_event.h"
16#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" 16#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
17#include "core/hle/service/nvdrv/nvdrv.h" 17#include "core/hle/service/nvdrv/nvdrv.h"
18#include "core/hle/service/nvflinger/buffer_item_consumer.h" 18#include "core/hle/service/nvnflinger/buffer_item_consumer.h"
19#include "core/hle/service/nvflinger/buffer_queue_core.h" 19#include "core/hle/service/nvnflinger/buffer_queue_core.h"
20#include "core/hle/service/nvflinger/hos_binder_driver_server.h" 20#include "core/hle/service/nvnflinger/hos_binder_driver_server.h"
21#include "core/hle/service/nvflinger/nvflinger.h" 21#include "core/hle/service/nvnflinger/nvnflinger.h"
22#include "core/hle/service/nvflinger/ui/graphic_buffer.h" 22#include "core/hle/service/nvnflinger/ui/graphic_buffer.h"
23#include "core/hle/service/vi/display/vi_display.h" 23#include "core/hle/service/vi/display/vi_display.h"
24#include "core/hle/service/vi/layer/vi_layer.h" 24#include "core/hle/service/vi/layer/vi_layer.h"
25#include "core/hle/service/vi/vi_results.h" 25#include "core/hle/service/vi/vi_results.h"
@@ -27,11 +27,11 @@
27#include "video_core/host1x/host1x.h" 27#include "video_core/host1x/host1x.h"
28#include "video_core/host1x/syncpoint_manager.h" 28#include "video_core/host1x/syncpoint_manager.h"
29 29
30namespace Service::NVFlinger { 30namespace Service::Nvnflinger {
31 31
32constexpr auto frame_ns = std::chrono::nanoseconds{1000000000 / 60}; 32constexpr auto frame_ns = std::chrono::nanoseconds{1000000000 / 60};
33 33
34void NVFlinger::SplitVSync(std::stop_token stop_token) { 34void Nvnflinger::SplitVSync(std::stop_token stop_token) {
35 system.RegisterHostThread(); 35 system.RegisterHostThread();
36 std::string name = "VSyncThread"; 36 std::string name = "VSyncThread";
37 MicroProfileOnThreadCreate(name.c_str()); 37 MicroProfileOnThreadCreate(name.c_str());
@@ -54,8 +54,8 @@ void NVFlinger::SplitVSync(std::stop_token stop_token) {
54 } 54 }
55} 55}
56 56
57NVFlinger::NVFlinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_) 57Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_)
58 : system(system_), service_context(system_, "nvflinger"), 58 : system(system_), service_context(system_, "nvnflinger"),
59 hos_binder_driver_server(hos_binder_driver_server_) { 59 hos_binder_driver_server(hos_binder_driver_server_) {
60 displays.emplace_back(0, "Default", hos_binder_driver_server, service_context, system); 60 displays.emplace_back(0, "Default", hos_binder_driver_server, service_context, system);
61 displays.emplace_back(1, "External", hos_binder_driver_server, service_context, system); 61 displays.emplace_back(1, "External", hos_binder_driver_server, service_context, system);
@@ -92,7 +92,7 @@ NVFlinger::NVFlinger(Core::System& system_, HosBinderDriverServer& hos_binder_dr
92 } 92 }
93} 93}
94 94
95NVFlinger::~NVFlinger() { 95Nvnflinger::~Nvnflinger() {
96 if (system.IsMulticore()) { 96 if (system.IsMulticore()) {
97 system.CoreTiming().UnscheduleEvent(multi_composition_event, {}); 97 system.CoreTiming().UnscheduleEvent(multi_composition_event, {});
98 vsync_thread.request_stop(); 98 vsync_thread.request_stop();
@@ -109,7 +109,7 @@ NVFlinger::~NVFlinger() {
109 } 109 }
110} 110}
111 111
112void NVFlinger::ShutdownLayers() { 112void Nvnflinger::ShutdownLayers() {
113 for (auto& display : displays) { 113 for (auto& display : displays) {
114 for (size_t layer = 0; layer < display.GetNumLayers(); ++layer) { 114 for (size_t layer = 0; layer < display.GetNumLayers(); ++layer) {
115 display.GetLayer(layer).Core().NotifyShutdown(); 115 display.GetLayer(layer).Core().NotifyShutdown();
@@ -117,15 +117,15 @@ void NVFlinger::ShutdownLayers() {
117 } 117 }
118} 118}
119 119
120void NVFlinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) { 120void Nvnflinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) {
121 nvdrv = std::move(instance); 121 nvdrv = std::move(instance);
122 disp_fd = nvdrv->Open("/dev/nvdisp_disp0"); 122 disp_fd = nvdrv->Open("/dev/nvdisp_disp0");
123} 123}
124 124
125std::optional<u64> NVFlinger::OpenDisplay(std::string_view name) { 125std::optional<u64> Nvnflinger::OpenDisplay(std::string_view name) {
126 const auto lock_guard = Lock(); 126 const auto lock_guard = Lock();
127 127
128 LOG_DEBUG(Service_NVFlinger, "Opening \"{}\" display", name); 128 LOG_DEBUG(Service_Nvnflinger, "Opening \"{}\" display", name);
129 129
130 const auto itr = 130 const auto itr =
131 std::find_if(displays.begin(), displays.end(), 131 std::find_if(displays.begin(), displays.end(),
@@ -138,7 +138,7 @@ std::optional<u64> NVFlinger::OpenDisplay(std::string_view name) {
138 return itr->GetID(); 138 return itr->GetID();
139} 139}
140 140
141bool NVFlinger::CloseDisplay(u64 display_id) { 141bool Nvnflinger::CloseDisplay(u64 display_id) {
142 const auto lock_guard = Lock(); 142 const auto lock_guard = Lock();
143 auto* const display = FindDisplay(display_id); 143 auto* const display = FindDisplay(display_id);
144 144
@@ -151,7 +151,7 @@ bool NVFlinger::CloseDisplay(u64 display_id) {
151 return true; 151 return true;
152} 152}
153 153
154std::optional<u64> NVFlinger::CreateLayer(u64 display_id) { 154std::optional<u64> Nvnflinger::CreateLayer(u64 display_id) {
155 const auto lock_guard = Lock(); 155 const auto lock_guard = Lock();
156 auto* const display = FindDisplay(display_id); 156 auto* const display = FindDisplay(display_id);
157 157
@@ -164,12 +164,12 @@ std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
164 return layer_id; 164 return layer_id;
165} 165}
166 166
167void NVFlinger::CreateLayerAtId(VI::Display& display, u64 layer_id) { 167void Nvnflinger::CreateLayerAtId(VI::Display& display, u64 layer_id) {
168 const auto buffer_id = next_buffer_queue_id++; 168 const auto buffer_id = next_buffer_queue_id++;
169 display.CreateLayer(layer_id, buffer_id, nvdrv->container); 169 display.CreateLayer(layer_id, buffer_id, nvdrv->container);
170} 170}
171 171
172void NVFlinger::CloseLayer(u64 layer_id) { 172void Nvnflinger::CloseLayer(u64 layer_id) {
173 const auto lock_guard = Lock(); 173 const auto lock_guard = Lock();
174 174
175 for (auto& display : displays) { 175 for (auto& display : displays) {
@@ -177,7 +177,7 @@ void NVFlinger::CloseLayer(u64 layer_id) {
177 } 177 }
178} 178}
179 179
180std::optional<u32> NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) { 180std::optional<u32> Nvnflinger::FindBufferQueueId(u64 display_id, u64 layer_id) {
181 const auto lock_guard = Lock(); 181 const auto lock_guard = Lock();
182 const auto* const layer = FindOrCreateLayer(display_id, layer_id); 182 const auto* const layer = FindOrCreateLayer(display_id, layer_id);
183 183
@@ -188,7 +188,7 @@ std::optional<u32> NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) {
188 return layer->GetBinderId(); 188 return layer->GetBinderId();
189} 189}
190 190
191ResultVal<Kernel::KReadableEvent*> NVFlinger::FindVsyncEvent(u64 display_id) { 191ResultVal<Kernel::KReadableEvent*> Nvnflinger::FindVsyncEvent(u64 display_id) {
192 const auto lock_guard = Lock(); 192 const auto lock_guard = Lock();
193 auto* const display = FindDisplay(display_id); 193 auto* const display = FindDisplay(display_id);
194 194
@@ -199,7 +199,7 @@ ResultVal<Kernel::KReadableEvent*> NVFlinger::FindVsyncEvent(u64 display_id) {
199 return display->GetVSyncEvent(); 199 return display->GetVSyncEvent();
200} 200}
201 201
202VI::Display* NVFlinger::FindDisplay(u64 display_id) { 202VI::Display* Nvnflinger::FindDisplay(u64 display_id) {
203 const auto itr = 203 const auto itr =
204 std::find_if(displays.begin(), displays.end(), 204 std::find_if(displays.begin(), displays.end(),
205 [&](const VI::Display& display) { return display.GetID() == display_id; }); 205 [&](const VI::Display& display) { return display.GetID() == display_id; });
@@ -211,7 +211,7 @@ VI::Display* NVFlinger::FindDisplay(u64 display_id) {
211 return &*itr; 211 return &*itr;
212} 212}
213 213
214const VI::Display* NVFlinger::FindDisplay(u64 display_id) const { 214const VI::Display* Nvnflinger::FindDisplay(u64 display_id) const {
215 const auto itr = 215 const auto itr =
216 std::find_if(displays.begin(), displays.end(), 216 std::find_if(displays.begin(), displays.end(),
217 [&](const VI::Display& display) { return display.GetID() == display_id; }); 217 [&](const VI::Display& display) { return display.GetID() == display_id; });
@@ -223,7 +223,7 @@ const VI::Display* NVFlinger::FindDisplay(u64 display_id) const {
223 return &*itr; 223 return &*itr;
224} 224}
225 225
226VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) { 226VI::Layer* Nvnflinger::FindLayer(u64 display_id, u64 layer_id) {
227 auto* const display = FindDisplay(display_id); 227 auto* const display = FindDisplay(display_id);
228 228
229 if (display == nullptr) { 229 if (display == nullptr) {
@@ -233,7 +233,7 @@ VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) {
233 return display->FindLayer(layer_id); 233 return display->FindLayer(layer_id);
234} 234}
235 235
236const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const { 236const VI::Layer* Nvnflinger::FindLayer(u64 display_id, u64 layer_id) const {
237 const auto* const display = FindDisplay(display_id); 237 const auto* const display = FindDisplay(display_id);
238 238
239 if (display == nullptr) { 239 if (display == nullptr) {
@@ -243,7 +243,7 @@ const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const {
243 return display->FindLayer(layer_id); 243 return display->FindLayer(layer_id);
244} 244}
245 245
246VI::Layer* NVFlinger::FindOrCreateLayer(u64 display_id, u64 layer_id) { 246VI::Layer* Nvnflinger::FindOrCreateLayer(u64 display_id, u64 layer_id) {
247 auto* const display = FindDisplay(display_id); 247 auto* const display = FindDisplay(display_id);
248 248
249 if (display == nullptr) { 249 if (display == nullptr) {
@@ -253,7 +253,7 @@ VI::Layer* NVFlinger::FindOrCreateLayer(u64 display_id, u64 layer_id) {
253 auto* layer = display->FindLayer(layer_id); 253 auto* layer = display->FindLayer(layer_id);
254 254
255 if (layer == nullptr) { 255 if (layer == nullptr) {
256 LOG_DEBUG(Service_NVFlinger, "Layer at id {} not found. Trying to create it.", layer_id); 256 LOG_DEBUG(Service_Nvnflinger, "Layer at id {} not found. Trying to create it.", layer_id);
257 CreateLayerAtId(*display, layer_id); 257 CreateLayerAtId(*display, layer_id);
258 return display->FindLayer(layer_id); 258 return display->FindLayer(layer_id);
259 } 259 }
@@ -261,7 +261,7 @@ VI::Layer* NVFlinger::FindOrCreateLayer(u64 display_id, u64 layer_id) {
261 return layer; 261 return layer;
262} 262}
263 263
264void NVFlinger::Compose() { 264void Nvnflinger::Compose() {
265 for (auto& display : displays) { 265 for (auto& display : displays) {
266 // Trigger vsync for this display at the end of drawing 266 // Trigger vsync for this display at the end of drawing
267 SCOPE_EXIT({ display.SignalVSyncEvent(); }); 267 SCOPE_EXIT({ display.SignalVSyncEvent(); });
@@ -311,7 +311,7 @@ void NVFlinger::Compose() {
311 } 311 }
312} 312}
313 313
314s64 NVFlinger::GetNextTicks() const { 314s64 Nvnflinger::GetNextTicks() const {
315 const auto& settings = Settings::values; 315 const auto& settings = Settings::values;
316 auto speed_scale = 1.f; 316 auto speed_scale = 1.f;
317 if (settings.use_multi_core.GetValue()) { 317 if (settings.use_multi_core.GetValue()) {
@@ -332,4 +332,4 @@ s64 NVFlinger::GetNextTicks() const {
332 return static_cast<s64>(speed_scale * (1000000000.f / effective_fps)); 332 return static_cast<s64>(speed_scale * (1000000000.f / effective_fps));
333} 333}
334 334
335} // namespace Service::NVFlinger 335} // namespace Service::Nvnflinger
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvnflinger/nvnflinger.h
index 3828cf272..a043cceb2 100644
--- a/src/core/hle/service/nvflinger/nvflinger.h
+++ b/src/core/hle/service/nvnflinger/nvnflinger.h
@@ -42,12 +42,12 @@ class BufferQueueCore;
42class BufferQueueProducer; 42class BufferQueueProducer;
43} // namespace Service::android 43} // namespace Service::android
44 44
45namespace Service::NVFlinger { 45namespace Service::Nvnflinger {
46 46
47class NVFlinger final { 47class Nvnflinger final {
48public: 48public:
49 explicit NVFlinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_); 49 explicit Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_driver_server_);
50 ~NVFlinger(); 50 ~Nvnflinger();
51 51
52 void ShutdownLayers(); 52 void ShutdownLayers();
53 53
@@ -152,4 +152,4 @@ private:
152 HosBinderDriverServer& hos_binder_driver_server; 152 HosBinderDriverServer& hos_binder_driver_server;
153}; 153};
154 154
155} // namespace Service::NVFlinger 155} // namespace Service::Nvnflinger
diff --git a/src/core/hle/service/nvflinger/parcel.h b/src/core/hle/service/nvnflinger/parcel.h
index d1b6201e0..d1b6201e0 100644
--- a/src/core/hle/service/nvflinger/parcel.h
+++ b/src/core/hle/service/nvnflinger/parcel.h
diff --git a/src/core/hle/service/nvflinger/pixel_format.h b/src/core/hle/service/nvnflinger/pixel_format.h
index f77d0acfb..f77d0acfb 100644
--- a/src/core/hle/service/nvflinger/pixel_format.h
+++ b/src/core/hle/service/nvnflinger/pixel_format.h
diff --git a/src/core/hle/service/nvflinger/producer_listener.h b/src/core/hle/service/nvnflinger/producer_listener.h
index 6bf8aaf1e..6bf8aaf1e 100644
--- a/src/core/hle/service/nvflinger/producer_listener.h
+++ b/src/core/hle/service/nvnflinger/producer_listener.h
diff --git a/src/core/hle/service/nvflinger/status.h b/src/core/hle/service/nvnflinger/status.h
index 7af166c40..7af166c40 100644
--- a/src/core/hle/service/nvflinger/status.h
+++ b/src/core/hle/service/nvnflinger/status.h
diff --git a/src/core/hle/service/nvflinger/ui/fence.h b/src/core/hle/service/nvnflinger/ui/fence.h
index 536e8156d..536e8156d 100644
--- a/src/core/hle/service/nvflinger/ui/fence.h
+++ b/src/core/hle/service/nvnflinger/ui/fence.h
diff --git a/src/core/hle/service/nvflinger/ui/graphic_buffer.h b/src/core/hle/service/nvnflinger/ui/graphic_buffer.h
index 9a27f8f02..75d1705a8 100644
--- a/src/core/hle/service/nvflinger/ui/graphic_buffer.h
+++ b/src/core/hle/service/nvnflinger/ui/graphic_buffer.h
@@ -8,7 +8,7 @@
8 8
9#include "common/common_funcs.h" 9#include "common/common_funcs.h"
10#include "common/common_types.h" 10#include "common/common_types.h"
11#include "core/hle/service/nvflinger/pixel_format.h" 11#include "core/hle/service/nvnflinger/pixel_format.h"
12 12
13namespace Service::android { 13namespace Service::android {
14 14
diff --git a/src/core/hle/service/nvflinger/window.h b/src/core/hle/service/nvnflinger/window.h
index 61cca5b01..61cca5b01 100644
--- a/src/core/hle/service/nvflinger/window.h
+++ b/src/core/hle/service/nvnflinger/window.h
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 6415fc310..eed615377 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -49,8 +49,8 @@
49#include "core/hle/service/npns/npns.h" 49#include "core/hle/service/npns/npns.h"
50#include "core/hle/service/ns/ns.h" 50#include "core/hle/service/ns/ns.h"
51#include "core/hle/service/nvdrv/nvdrv.h" 51#include "core/hle/service/nvdrv/nvdrv.h"
52#include "core/hle/service/nvflinger/hos_binder_driver_server.h" 52#include "core/hle/service/nvnflinger/hos_binder_driver_server.h"
53#include "core/hle/service/nvflinger/nvflinger.h" 53#include "core/hle/service/nvnflinger/nvnflinger.h"
54#include "core/hle/service/olsc/olsc.h" 54#include "core/hle/service/olsc/olsc.h"
55#include "core/hle/service/pcie/pcie.h" 55#include "core/hle/service/pcie/pcie.h"
56#include "core/hle/service/pctl/pctl_module.h" 56#include "core/hle/service/pctl/pctl_module.h"
@@ -210,12 +210,12 @@ Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session,
210 210
211/// Initialize Services 211/// Initialize Services
212Services::Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system) 212Services::Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system)
213 : hos_binder_driver_server{std::make_unique<NVFlinger::HosBinderDriverServer>(system)}, 213 : hos_binder_driver_server{std::make_unique<Nvnflinger::HosBinderDriverServer>(system)},
214 nv_flinger{std::make_unique<NVFlinger::NVFlinger>(system, *hos_binder_driver_server)} { 214 nv_flinger{std::make_unique<Nvnflinger::Nvnflinger>(system, *hos_binder_driver_server)} {
215 215
216 auto& kernel = system.Kernel(); 216 auto& kernel = system.Kernel();
217 217
218 // NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it 218 // Nvnflinger needs to be accessed by several services like Vi and AppletOE so we instantiate it
219 // here and pass it into the respective InstallInterfaces functions. 219 // here and pass it into the respective InstallInterfaces functions.
220 system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false); 220 system.GetFileSystemController().CreateFactories(*system.GetFilesystem(), false);
221 221
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 06226409a..0f79a1b7e 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -28,10 +28,10 @@ namespace FileSystem {
28class FileSystemController; 28class FileSystemController;
29} 29}
30 30
31namespace NVFlinger { 31namespace Nvnflinger {
32class HosBinderDriverServer; 32class HosBinderDriverServer;
33class NVFlinger; 33class Nvnflinger;
34} // namespace NVFlinger 34} // namespace Nvnflinger
35 35
36namespace SM { 36namespace SM {
37class ServiceManager; 37class ServiceManager;
@@ -228,8 +228,8 @@ public:
228 void KillNVNFlinger(); 228 void KillNVNFlinger();
229 229
230private: 230private:
231 std::unique_ptr<NVFlinger::HosBinderDriverServer> hos_binder_driver_server; 231 std::unique_ptr<Nvnflinger::HosBinderDriverServer> hos_binder_driver_server;
232 std::unique_ptr<NVFlinger::NVFlinger> nv_flinger; 232 std::unique_ptr<Nvnflinger::Nvnflinger> nv_flinger;
233}; 233};
234 234
235} // namespace Service 235} // namespace Service
diff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/core/hle/service/vi/display/vi_display.cpp
index 8ef74f1f0..69af2868a 100644
--- a/src/core/hle/service/vi/display/vi_display.cpp
+++ b/src/core/hle/service/vi/display/vi_display.cpp
@@ -12,11 +12,11 @@
12#include "core/hle/kernel/k_readable_event.h" 12#include "core/hle/kernel/k_readable_event.h"
13#include "core/hle/service/kernel_helpers.h" 13#include "core/hle/service/kernel_helpers.h"
14#include "core/hle/service/nvdrv/core/container.h" 14#include "core/hle/service/nvdrv/core/container.h"
15#include "core/hle/service/nvflinger/buffer_item_consumer.h" 15#include "core/hle/service/nvnflinger/buffer_item_consumer.h"
16#include "core/hle/service/nvflinger/buffer_queue_consumer.h" 16#include "core/hle/service/nvnflinger/buffer_queue_consumer.h"
17#include "core/hle/service/nvflinger/buffer_queue_core.h" 17#include "core/hle/service/nvnflinger/buffer_queue_core.h"
18#include "core/hle/service/nvflinger/buffer_queue_producer.h" 18#include "core/hle/service/nvnflinger/buffer_queue_producer.h"
19#include "core/hle/service/nvflinger/hos_binder_driver_server.h" 19#include "core/hle/service/nvnflinger/hos_binder_driver_server.h"
20#include "core/hle/service/vi/display/vi_display.h" 20#include "core/hle/service/vi/display/vi_display.h"
21#include "core/hle/service/vi/layer/vi_layer.h" 21#include "core/hle/service/vi/layer/vi_layer.h"
22#include "core/hle/service/vi/vi_results.h" 22#include "core/hle/service/vi/vi_results.h"
@@ -39,7 +39,7 @@ static BufferQueue CreateBufferQueue(KernelHelpers::ServiceContext& service_cont
39} 39}
40 40
41Display::Display(u64 id, std::string name_, 41Display::Display(u64 id, std::string name_,
42 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_, 42 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_,
43 KernelHelpers::ServiceContext& service_context_, Core::System& system_) 43 KernelHelpers::ServiceContext& service_context_, Core::System& system_)
44 : display_id{id}, name{std::move(name_)}, hos_binder_driver_server{hos_binder_driver_server_}, 44 : display_id{id}, name{std::move(name_)}, hos_binder_driver_server{hos_binder_driver_server_},
45 service_context{service_context_} { 45 service_context{service_context_} {
diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/core/hle/service/vi/display/vi_display.h
index 0b65a65da..3f31d1f32 100644
--- a/src/core/hle/service/vi/display/vi_display.h
+++ b/src/core/hle/service/vi/display/vi_display.h
@@ -23,7 +23,7 @@ namespace Service::KernelHelpers {
23class ServiceContext; 23class ServiceContext;
24} 24}
25 25
26namespace Service::NVFlinger { 26namespace Service::Nvnflinger {
27class HosBinderDriverServer; 27class HosBinderDriverServer;
28} 28}
29 29
@@ -45,12 +45,12 @@ public:
45 /// Constructs a display with a given unique ID and name. 45 /// Constructs a display with a given unique ID and name.
46 /// 46 ///
47 /// @param id The unique ID for this display. 47 /// @param id The unique ID for this display.
48 /// @param hos_binder_driver_server_ NVFlinger HOSBinderDriver server instance. 48 /// @param hos_binder_driver_server_ Nvnflinger HOSBinderDriver server instance.
49 /// @param service_context_ The ServiceContext for the owning service. 49 /// @param service_context_ The ServiceContext for the owning service.
50 /// @param name_ The name for this display. 50 /// @param name_ The name for this display.
51 /// @param system_ The global system instance. 51 /// @param system_ The global system instance.
52 /// 52 ///
53 Display(u64 id, std::string name_, NVFlinger::HosBinderDriverServer& hos_binder_driver_server_, 53 Display(u64 id, std::string name_, Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_,
54 KernelHelpers::ServiceContext& service_context_, Core::System& system_); 54 KernelHelpers::ServiceContext& service_context_, Core::System& system_);
55 ~Display(); 55 ~Display();
56 56
@@ -133,7 +133,7 @@ public:
133private: 133private:
134 u64 display_id; 134 u64 display_id;
135 std::string name; 135 std::string name;
136 NVFlinger::HosBinderDriverServer& hos_binder_driver_server; 136 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server;
137 KernelHelpers::ServiceContext& service_context; 137 KernelHelpers::ServiceContext& service_context;
138 138
139 std::vector<std::unique_ptr<Layer>> layers; 139 std::vector<std::unique_ptr<Layer>> layers;
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index fca076d7a..68eab5133 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -21,11 +21,11 @@
21#include "core/hle/kernel/k_thread.h" 21#include "core/hle/kernel/k_thread.h"
22#include "core/hle/service/ipc_helpers.h" 22#include "core/hle/service/ipc_helpers.h"
23#include "core/hle/service/nvdrv/nvdata.h" 23#include "core/hle/service/nvdrv/nvdata.h"
24#include "core/hle/service/nvflinger/binder.h" 24#include "core/hle/service/nvnflinger/binder.h"
25#include "core/hle/service/nvflinger/buffer_queue_producer.h" 25#include "core/hle/service/nvnflinger/buffer_queue_producer.h"
26#include "core/hle/service/nvflinger/hos_binder_driver_server.h" 26#include "core/hle/service/nvnflinger/hos_binder_driver_server.h"
27#include "core/hle/service/nvflinger/nvflinger.h" 27#include "core/hle/service/nvnflinger/nvnflinger.h"
28#include "core/hle/service/nvflinger/parcel.h" 28#include "core/hle/service/nvnflinger/parcel.h"
29#include "core/hle/service/server_manager.h" 29#include "core/hle/service/server_manager.h"
30#include "core/hle/service/service.h" 30#include "core/hle/service/service.h"
31#include "core/hle/service/vi/vi.h" 31#include "core/hle/service/vi/vi.h"
@@ -73,7 +73,7 @@ static_assert(sizeof(NativeWindow) == 0x28, "NativeWindow has wrong size");
73 73
74class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> { 74class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> {
75public: 75public:
76 explicit IHOSBinderDriver(Core::System& system_, NVFlinger::HosBinderDriverServer& server_) 76 explicit IHOSBinderDriver(Core::System& system_, Nvnflinger::HosBinderDriverServer& server_)
77 : ServiceFramework{system_, "IHOSBinderDriver"}, server(server_) { 77 : ServiceFramework{system_, "IHOSBinderDriver"}, server(server_) {
78 static const FunctionInfo functions[] = { 78 static const FunctionInfo functions[] = {
79 {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"}, 79 {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"},
@@ -126,7 +126,7 @@ private:
126 } 126 }
127 127
128private: 128private:
129 NVFlinger::HosBinderDriverServer& server; 129 Nvnflinger::HosBinderDriverServer& server;
130}; 130};
131 131
132class ISystemDisplayService final : public ServiceFramework<ISystemDisplayService> { 132class ISystemDisplayService final : public ServiceFramework<ISystemDisplayService> {
@@ -232,7 +232,7 @@ private:
232 232
233class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> { 233class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> {
234public: 234public:
235 explicit IManagerDisplayService(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_) 235 explicit IManagerDisplayService(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_)
236 : ServiceFramework{system_, "IManagerDisplayService"}, nv_flinger{nv_flinger_} { 236 : ServiceFramework{system_, "IManagerDisplayService"}, nv_flinger{nv_flinger_} {
237 // clang-format off 237 // clang-format off
238 static const FunctionInfo functions[] = { 238 static const FunctionInfo functions[] = {
@@ -383,13 +383,13 @@ private:
383 rb.Push(ResultSuccess); 383 rb.Push(ResultSuccess);
384 } 384 }
385 385
386 NVFlinger::NVFlinger& nv_flinger; 386 Nvnflinger::Nvnflinger& nv_flinger;
387}; 387};
388 388
389class IApplicationDisplayService final : public ServiceFramework<IApplicationDisplayService> { 389class IApplicationDisplayService final : public ServiceFramework<IApplicationDisplayService> {
390public: 390public:
391 IApplicationDisplayService(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, 391 IApplicationDisplayService(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_,
392 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) 392 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_)
393 : ServiceFramework{system_, "IApplicationDisplayService"}, nv_flinger{nv_flinger_}, 393 : ServiceFramework{system_, "IApplicationDisplayService"}, nv_flinger{nv_flinger_},
394 hos_binder_driver_server{hos_binder_driver_server_} { 394 hos_binder_driver_server{hos_binder_driver_server_} {
395 395
@@ -774,8 +774,8 @@ private:
774 } 774 }
775 } 775 }
776 776
777 NVFlinger::NVFlinger& nv_flinger; 777 Nvnflinger::Nvnflinger& nv_flinger;
778 NVFlinger::HosBinderDriverServer& hos_binder_driver_server; 778 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server;
779}; 779};
780 780
781static bool IsValidServiceAccess(Permission permission, Policy policy) { 781static bool IsValidServiceAccess(Permission permission, Policy policy) {
@@ -791,8 +791,8 @@ static bool IsValidServiceAccess(Permission permission, Policy policy) {
791} 791}
792 792
793void detail::GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system, 793void detail::GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system,
794 NVFlinger::NVFlinger& nv_flinger, 794 Nvnflinger::Nvnflinger& nv_flinger,
795 NVFlinger::HosBinderDriverServer& hos_binder_driver_server, 795 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server,
796 Permission permission) { 796 Permission permission) {
797 IPC::RequestParser rp{ctx}; 797 IPC::RequestParser rp{ctx};
798 const auto policy = rp.PopEnum<Policy>(); 798 const auto policy = rp.PopEnum<Policy>();
@@ -809,8 +809,8 @@ void detail::GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system,
809 rb.PushIpcInterface<IApplicationDisplayService>(system, nv_flinger, hos_binder_driver_server); 809 rb.PushIpcInterface<IApplicationDisplayService>(system, nv_flinger, hos_binder_driver_server);
810} 810}
811 811
812void LoopProcess(Core::System& system, NVFlinger::NVFlinger& nv_flinger, 812void LoopProcess(Core::System& system, Nvnflinger::Nvnflinger& nv_flinger,
813 NVFlinger::HosBinderDriverServer& hos_binder_driver_server) { 813 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server) {
814 auto server_manager = std::make_unique<ServerManager>(system); 814 auto server_manager = std::make_unique<ServerManager>(system);
815 815
816 server_manager->RegisterNamedService( 816 server_manager->RegisterNamedService(
diff --git a/src/core/hle/service/vi/vi.h b/src/core/hle/service/vi/vi.h
index 48b2f30aa..a35b62f97 100644
--- a/src/core/hle/service/vi/vi.h
+++ b/src/core/hle/service/vi/vi.h
@@ -13,10 +13,10 @@ namespace Service {
13class HLERequestContext; 13class HLERequestContext;
14} 14}
15 15
16namespace Service::NVFlinger { 16namespace Service::Nvnflinger {
17class HosBinderDriverServer; 17class HosBinderDriverServer;
18class NVFlinger; 18class Nvnflinger;
19} // namespace Service::NVFlinger 19} // namespace Service::Nvnflinger
20 20
21namespace Service::VI { 21namespace Service::VI {
22 22
@@ -43,12 +43,12 @@ enum class Policy {
43 43
44namespace detail { 44namespace detail {
45void GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system, 45void GetDisplayServiceImpl(HLERequestContext& ctx, Core::System& system,
46 NVFlinger::NVFlinger& nv_flinger, 46 Nvnflinger::Nvnflinger& nv_flinger,
47 NVFlinger::HosBinderDriverServer& hos_binder_driver_server, 47 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server,
48 Permission permission); 48 Permission permission);
49} // namespace detail 49} // namespace detail
50 50
51void LoopProcess(Core::System& system, NVFlinger::NVFlinger& nv_flinger, 51void LoopProcess(Core::System& system, Nvnflinger::Nvnflinger& nv_flinger,
52 NVFlinger::HosBinderDriverServer& hos_binder_driver_server); 52 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server);
53 53
54} // namespace Service::VI 54} // namespace Service::VI
diff --git a/src/core/hle/service/vi/vi_m.cpp b/src/core/hle/service/vi/vi_m.cpp
index 019e55811..0f06dc2f3 100644
--- a/src/core/hle/service/vi/vi_m.cpp
+++ b/src/core/hle/service/vi/vi_m.cpp
@@ -7,8 +7,8 @@
7 7
8namespace Service::VI { 8namespace Service::VI {
9 9
10VI_M::VI_M(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, 10VI_M::VI_M(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_,
11 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) 11 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_)
12 : ServiceFramework{system_, "vi:m"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{ 12 : ServiceFramework{system_, "vi:m"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{
13 hos_binder_driver_server_} { 13 hos_binder_driver_server_} {
14 static const FunctionInfo functions[] = { 14 static const FunctionInfo functions[] = {
diff --git a/src/core/hle/service/vi/vi_m.h b/src/core/hle/service/vi/vi_m.h
index 392da04a3..9ca6f3905 100644
--- a/src/core/hle/service/vi/vi_m.h
+++ b/src/core/hle/service/vi/vi_m.h
@@ -9,24 +9,24 @@ namespace Core {
9class System; 9class System;
10} 10}
11 11
12namespace Service::NVFlinger { 12namespace Service::Nvnflinger {
13class HosBinderDriverServer; 13class HosBinderDriverServer;
14class NVFlinger; 14class Nvnflinger;
15} // namespace Service::NVFlinger 15} // namespace Service::Nvnflinger
16 16
17namespace Service::VI { 17namespace Service::VI {
18 18
19class VI_M final : public ServiceFramework<VI_M> { 19class VI_M final : public ServiceFramework<VI_M> {
20public: 20public:
21 explicit VI_M(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, 21 explicit VI_M(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_,
22 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_); 22 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_);
23 ~VI_M() override; 23 ~VI_M() override;
24 24
25private: 25private:
26 void GetDisplayService(HLERequestContext& ctx); 26 void GetDisplayService(HLERequestContext& ctx);
27 27
28 NVFlinger::NVFlinger& nv_flinger; 28 Nvnflinger::Nvnflinger& nv_flinger;
29 NVFlinger::HosBinderDriverServer& hos_binder_driver_server; 29 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server;
30}; 30};
31 31
32} // namespace Service::VI 32} // namespace Service::VI
diff --git a/src/core/hle/service/vi/vi_s.cpp b/src/core/hle/service/vi/vi_s.cpp
index 901c5988e..77f7a88ff 100644
--- a/src/core/hle/service/vi/vi_s.cpp
+++ b/src/core/hle/service/vi/vi_s.cpp
@@ -7,8 +7,8 @@
7 7
8namespace Service::VI { 8namespace Service::VI {
9 9
10VI_S::VI_S(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, 10VI_S::VI_S(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_,
11 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) 11 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_)
12 : ServiceFramework{system_, "vi:s"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{ 12 : ServiceFramework{system_, "vi:s"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{
13 hos_binder_driver_server_} { 13 hos_binder_driver_server_} {
14 static const FunctionInfo functions[] = { 14 static const FunctionInfo functions[] = {
diff --git a/src/core/hle/service/vi/vi_s.h b/src/core/hle/service/vi/vi_s.h
index 34282fcfd..157839c91 100644
--- a/src/core/hle/service/vi/vi_s.h
+++ b/src/core/hle/service/vi/vi_s.h
@@ -9,24 +9,24 @@ namespace Core {
9class System; 9class System;
10} 10}
11 11
12namespace Service::NVFlinger { 12namespace Service::Nvnflinger {
13class HosBinderDriverServer; 13class HosBinderDriverServer;
14class NVFlinger; 14class Nvnflinger;
15} // namespace Service::NVFlinger 15} // namespace Service::Nvnflinger
16 16
17namespace Service::VI { 17namespace Service::VI {
18 18
19class VI_S final : public ServiceFramework<VI_S> { 19class VI_S final : public ServiceFramework<VI_S> {
20public: 20public:
21 explicit VI_S(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, 21 explicit VI_S(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_,
22 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_); 22 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_);
23 ~VI_S() override; 23 ~VI_S() override;
24 24
25private: 25private:
26 void GetDisplayService(HLERequestContext& ctx); 26 void GetDisplayService(HLERequestContext& ctx);
27 27
28 NVFlinger::NVFlinger& nv_flinger; 28 Nvnflinger::Nvnflinger& nv_flinger;
29 NVFlinger::HosBinderDriverServer& hos_binder_driver_server; 29 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server;
30}; 30};
31 31
32} // namespace Service::VI 32} // namespace Service::VI
diff --git a/src/core/hle/service/vi/vi_u.cpp b/src/core/hle/service/vi/vi_u.cpp
index 08c5cf486..59e13c86b 100644
--- a/src/core/hle/service/vi/vi_u.cpp
+++ b/src/core/hle/service/vi/vi_u.cpp
@@ -7,8 +7,8 @@
7 7
8namespace Service::VI { 8namespace Service::VI {
9 9
10VI_U::VI_U(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, 10VI_U::VI_U(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_,
11 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_) 11 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_)
12 : ServiceFramework{system_, "vi:u"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{ 12 : ServiceFramework{system_, "vi:u"}, nv_flinger{nv_flinger_}, hos_binder_driver_server{
13 hos_binder_driver_server_} { 13 hos_binder_driver_server_} {
14 static const FunctionInfo functions[] = { 14 static const FunctionInfo functions[] = {
diff --git a/src/core/hle/service/vi/vi_u.h b/src/core/hle/service/vi/vi_u.h
index 8b0a8dd02..5d9ca54c6 100644
--- a/src/core/hle/service/vi/vi_u.h
+++ b/src/core/hle/service/vi/vi_u.h
@@ -9,24 +9,24 @@ namespace Core {
9class System; 9class System;
10} 10}
11 11
12namespace Service::NVFlinger { 12namespace Service::Nvnflinger {
13class HosBinderDriverServer; 13class HosBinderDriverServer;
14class NVFlinger; 14class Nvnflinger;
15} // namespace Service::NVFlinger 15} // namespace Service::Nvnflinger
16 16
17namespace Service::VI { 17namespace Service::VI {
18 18
19class VI_U final : public ServiceFramework<VI_U> { 19class VI_U final : public ServiceFramework<VI_U> {
20public: 20public:
21 explicit VI_U(Core::System& system_, NVFlinger::NVFlinger& nv_flinger_, 21 explicit VI_U(Core::System& system_, Nvnflinger::Nvnflinger& nv_flinger_,
22 NVFlinger::HosBinderDriverServer& hos_binder_driver_server_); 22 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_);
23 ~VI_U() override; 23 ~VI_U() override;
24 24
25private: 25private:
26 void GetDisplayService(HLERequestContext& ctx); 26 void GetDisplayService(HLERequestContext& ctx);
27 27
28 NVFlinger::NVFlinger& nv_flinger; 28 Nvnflinger::Nvnflinger& nv_flinger;
29 NVFlinger::HosBinderDriverServer& hos_binder_driver_server; 29 Nvnflinger::HosBinderDriverServer& hos_binder_driver_server;
30}; 30};
31 31
32} // namespace Service::VI 32} // namespace Service::VI
diff --git a/src/video_core/framebuffer_config.h b/src/video_core/framebuffer_config.h
index d93f5a37f..5f3bffcab 100644
--- a/src/video_core/framebuffer_config.h
+++ b/src/video_core/framebuffer_config.h
@@ -5,8 +5,8 @@
5 5
6#include "common/common_types.h" 6#include "common/common_types.h"
7#include "common/math_util.h" 7#include "common/math_util.h"
8#include "core/hle/service/nvflinger/buffer_transform_flags.h" 8#include "core/hle/service/nvnflinger/buffer_transform_flags.h"
9#include "core/hle/service/nvflinger/pixel_format.h" 9#include "core/hle/service/nvnflinger/pixel_format.h"
10 10
11namespace Tegra { 11namespace Tegra {
12 12
HIC SVNT DRACONES