video_core: Add basic command list processing (#117)

src/video_core/texture_cache/image.cpp

@@ -95,9 +95,9 @@ void UniqueImage::Create(const vk::ImageCreateInfo& image_ci) {
 
 Image::Image(const Vulkan::Instance& instance_, Vulkan::Scheduler& scheduler_,
              const ImageInfo& info_, VAddr cpu_addr)
-    : instance{&instance_}, scheduler{&scheduler_}, info{info_}, image{instance->GetDevice(),
-                                                                       instance->GetAllocator()},
-      cpu_addr{cpu_addr}, cpu_addr_end{cpu_addr + info.guest_size_bytes} {
+    : instance{&instance_}, scheduler{&scheduler_}, info{info_},
+      image{instance->GetDevice(), instance->GetAllocator()}, cpu_addr{cpu_addr},
+      cpu_addr_end{cpu_addr + info.guest_size_bytes} {
     vk::ImageCreateFlags flags{};
     if (info.type == vk::ImageType::e2D && info.resources.layers >= 6 &&
         info.size.width == info.size.height) {

src/video_core/texture_cache/image.h

@@ -6,7 +6,6 @@
 #include "common/enum.h"
 #include "common/types.h"
 #include "core/libraries/videoout/buffer.h"
-#include "video_core/pixel_format.h"
 #include "video_core/renderer_vulkan/vk_common.h"
 #include "video_core/texture_cache/types.h"
 

src/video_core/texture_cache/image_view.cpp

@@ -6,45 +6,14 @@
 
 namespace VideoCore {
 
-[[nodiscard]] vk::ImageViewType ConvertImageViewType(const ImageViewType type) {
-    switch (type) {
-    case ImageViewType::e1D:
-        return vk::ImageViewType::e1D;
-    case ImageViewType::e2D:
-        return vk::ImageViewType::e2D;
-    case ImageViewType::e3D:
-        return vk::ImageViewType::e3D;
-    case ImageViewType::Buffer:
-        break;
-    default:
-        break;
-    }
-    UNREACHABLE_MSG("Invalid image type={}", static_cast<u32>(type));
-    return {};
-}
-
-[[nodiscard]] vk::Format ConvertPixelFormat(const PixelFormat format) {
-    switch (format) {
-    default:
-        break;
-    }
-    UNREACHABLE_MSG("Unknown format={}", static_cast<u32>(format));
-    return {};
-}
-
 ImageView::ImageView(const Vulkan::Instance& instance, Vulkan::Scheduler& scheduler,
                      const ImageViewInfo& info_, vk::Image image)
     : info{info_} {
     const vk::ImageViewCreateInfo image_view_ci = {
         .image = image,
-        .viewType = ConvertImageViewType(info.type),
-        .format = ConvertPixelFormat(info.format),
-        .components{
-            .r = vk::ComponentSwizzle::eIdentity,
-            .g = vk::ComponentSwizzle::eIdentity,
-            .b = vk::ComponentSwizzle::eIdentity,
-            .a = vk::ComponentSwizzle::eIdentity,
-        },
+        .viewType = info.type,
+        .format = info.format,
+        .components = info.mapping,
         .subresourceRange{
             .aspectMask = vk::ImageAspectFlagBits::eColor,
             .baseMipLevel = 0U,

src/video_core/texture_cache/image_view.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "video_core/pixel_format.h"
 #include "video_core/renderer_vulkan/vk_common.h"
 #include "video_core/texture_cache/types.h"
 
@@ -25,30 +24,26 @@ enum class ImageViewType : u32 {
     Buffer,
 };
 
-enum class SwizzleSource : u32 {
-    Zero = 0,
-    One = 1,
-    R = 2,
-    G = 3,
-    B = 4,
-    A = 5,
-};
-
 struct ImageViewInfo {
-    ImageViewType type{};
-    PixelFormat format{};
+    vk::ImageViewType type{};
+    vk::Format format{};
     SubresourceRange range;
-    u8 x_source = static_cast<u8>(SwizzleSource::R);
-    u8 y_source = static_cast<u8>(SwizzleSource::G);
-    u8 z_source = static_cast<u8>(SwizzleSource::B);
-    u8 w_source = static_cast<u8>(SwizzleSource::A);
+    vk::ComponentMapping mapping{};
+
+    auto operator<=>(const ImageViewInfo&) const = default;
 };
 
-class ImageView {
+struct ImageView {
     explicit ImageView(const Vulkan::Instance& instance, Vulkan::Scheduler& scheduler,
                        const ImageViewInfo& info, vk::Image image);
     ~ImageView();
 
+    ImageView(const ImageView&) = delete;
+    ImageView& operator=(const ImageView&) = delete;
+
+    ImageView(ImageView&&) = default;
+    ImageView& operator=(ImageView&&) = default;
+
     ImageId image_id{};
     Extent3D size{0, 0, 0};
     ImageViewInfo info{};