瀏覽代碼

LibVirtGPU: Port to `Core::Stream`

Lucas CHOLLET 2 年之前
父節點
當前提交
0ab29cffd2
共有 2 個文件被更改,包括 7 次插入7 次删除
  1. 4 4
      Userland/Libraries/LibVirtGPU/Device.cpp
  2. 3 3
      Userland/Libraries/LibVirtGPU/Device.h

+ 4 - 4
Userland/Libraries/LibVirtGPU/Device.cpp

@@ -38,15 +38,15 @@ static constexpr auto vert_shader = "VERT\n"
                                     "  4: MOV_SAT OUT[1], IN[1]\n"
                                     "  4: MOV_SAT OUT[1], IN[1]\n"
                                     "  5: END\n"sv;
                                     "  5: END\n"sv;
 
 
-Device::Device(NonnullRefPtr<Core::File> gpu_file)
-    : m_gpu_file { gpu_file }
+Device::Device(NonnullOwnPtr<Core::Stream::File> gpu_file)
+    : m_gpu_file { move(gpu_file) }
 {
 {
 }
 }
 
 
 ErrorOr<NonnullOwnPtr<Device>> Device::create(Gfx::IntSize min_size)
 ErrorOr<NonnullOwnPtr<Device>> Device::create(Gfx::IntSize min_size)
 {
 {
-    auto file = TRY(Core::File::open("/dev/gpu/render0", Core::OpenMode::ReadWrite));
-    auto device = make<Device>(file);
+    auto file = TRY(Core::Stream::File::open("/dev/gpu/render0"sv, Core::Stream::OpenMode::ReadWrite));
+    auto device = make<Device>(move(file));
     TRY(device->initialize_context(min_size));
     TRY(device->initialize_context(min_size));
     return device;
     return device;
 }
 }

+ 3 - 3
Userland/Libraries/LibVirtGPU/Device.h

@@ -10,7 +10,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/Vector.h>
 #include <AK/Vector.h>
 #include <Kernel/API/VirGL.h>
 #include <Kernel/API/VirGL.h>
-#include <LibCore/File.h>
+#include <LibCore/Stream.h>
 #include <LibGPU/Device.h>
 #include <LibGPU/Device.h>
 #include <LibVirtGPU/VirGLProtocol.h>
 #include <LibVirtGPU/VirGLProtocol.h>
 
 
@@ -18,7 +18,7 @@ namespace VirtGPU {
 
 
 class Device final : public GPU::Device {
 class Device final : public GPU::Device {
 public:
 public:
-    Device(NonnullRefPtr<Core::File>);
+    Device(NonnullOwnPtr<Core::Stream::File>);
 
 
     static ErrorOr<NonnullOwnPtr<Device>> create(Gfx::IntSize min_size);
     static ErrorOr<NonnullOwnPtr<Device>> create(Gfx::IntSize min_size);
 
 
@@ -66,7 +66,7 @@ private:
     ErrorOr<Protocol::ResourceID> create_virgl_resource(VirGL3DResourceSpec&);
     ErrorOr<Protocol::ResourceID> create_virgl_resource(VirGL3DResourceSpec&);
     ErrorOr<void> upload_command_buffer(Vector<u32> const&);
     ErrorOr<void> upload_command_buffer(Vector<u32> const&);
 
 
-    NonnullRefPtr<Core::File> m_gpu_file;
+    NonnullOwnPtr<Core::Stream::File> m_gpu_file;
 
 
     Protocol::ResourceID m_vbo_resource_id { 0 };
     Protocol::ResourceID m_vbo_resource_id { 0 };
     Protocol::ResourceID m_drawtarget { 0 };
     Protocol::ResourceID m_drawtarget { 0 };