Explorar el Código

nvflinger/buffer_queue: Remove use of a global system accessor

Lioncash hace 6 años
padre
commit
574440d59f

+ 2 - 2
src/core/hle/service/nvflinger/buffer_queue.cpp

@@ -14,8 +14,8 @@
 
 
 namespace Service::NVFlinger {
 namespace Service::NVFlinger {
 
 
-BufferQueue::BufferQueue(u32 id, u64 layer_id) : id(id), layer_id(layer_id) {
-    auto& kernel = Core::System::GetInstance().Kernel();
+BufferQueue::BufferQueue(Kernel::KernelCore& kernel, u32 id, u64 layer_id)
+    : id(id), layer_id(layer_id) {
     buffer_wait_event = Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Manual,
     buffer_wait_event = Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Manual,
                                                                "BufferQueue NativeHandle");
                                                                "BufferQueue NativeHandle");
 }
 }

+ 5 - 1
src/core/hle/service/nvflinger/buffer_queue.h

@@ -15,6 +15,10 @@
 #include "core/hle/kernel/writable_event.h"
 #include "core/hle/kernel/writable_event.h"
 #include "core/hle/service/nvdrv/nvdata.h"
 #include "core/hle/service/nvdrv/nvdata.h"
 
 
+namespace Kernel {
+class KernelCore;
+}
+
 namespace Service::NVFlinger {
 namespace Service::NVFlinger {
 
 
 struct IGBPBuffer {
 struct IGBPBuffer {
@@ -44,7 +48,7 @@ public:
         NativeWindowFormat = 2,
         NativeWindowFormat = 2,
     };
     };
 
 
-    BufferQueue(u32 id, u64 layer_id);
+    explicit BufferQueue(Kernel::KernelCore& kernel, u32 id, u64 layer_id);
     ~BufferQueue();
     ~BufferQueue();
 
 
     enum class BufferTransformFlags : u32 {
     enum class BufferTransformFlags : u32 {

+ 1 - 1
src/core/hle/service/nvflinger/nvflinger.cpp

@@ -83,7 +83,7 @@ std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
 
 
     const u64 layer_id = next_layer_id++;
     const u64 layer_id = next_layer_id++;
     const u32 buffer_queue_id = next_buffer_queue_id++;
     const u32 buffer_queue_id = next_buffer_queue_id++;
-    buffer_queues.emplace_back(buffer_queue_id, layer_id);
+    buffer_queues.emplace_back(system.Kernel(), buffer_queue_id, layer_id);
     display->CreateLayer(layer_id, buffer_queues.back());
     display->CreateLayer(layer_id, buffer_queues.back());
     return layer_id;
     return layer_id;
 }
 }