From 371d1d009aa936d9c3d7b022e616714f2ae762be Mon Sep 17 00:00:00 2001
From: psucien <bad_cast@protonmail.com>
Date: Tue, 27 Aug 2024 19:17:23 +0200
Subject: [PATCH] Added missing headers and 2D MSAA image type

---
 src/shader_recompiler/frontend/structured_control_flow.cpp | 1 +
 src/video_core/buffer_cache/buffer.h                       | 1 +
 src/video_core/texture_cache/image_info.cpp                | 1 +
 src/video_core/texture_cache/image_view.cpp                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/shader_recompiler/frontend/structured_control_flow.cpp b/src/shader_recompiler/frontend/structured_control_flow.cpp
index b50205d4..fefc623f 100644
--- a/src/shader_recompiler/frontend/structured_control_flow.cpp
+++ b/src/shader_recompiler/frontend/structured_control_flow.cpp
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <optional>
 #include <string>
 #include <unordered_map>
 #include <utility>
diff --git a/src/video_core/buffer_cache/buffer.h b/src/video_core/buffer_cache/buffer.h
index 5c64ba65..87293c76 100644
--- a/src/video_core/buffer_cache/buffer.h
+++ b/src/video_core/buffer_cache/buffer.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cstddef>
+#include <optional>
 #include <utility>
 #include <vector>
 #include "common/types.h"
diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp
index a073d046..4ac4aee8 100644
--- a/src/video_core/texture_cache/image_info.cpp
+++ b/src/video_core/texture_cache/image_info.cpp
@@ -34,6 +34,7 @@ static vk::ImageType ConvertImageType(AmdGpu::ImageType type) noexcept {
     case AmdGpu::ImageType::Color1DArray:
         return vk::ImageType::e1D;
     case AmdGpu::ImageType::Color2D:
+    case AmdGpu::ImageType::Color2DMsaa:
     case AmdGpu::ImageType::Cube:
     case AmdGpu::ImageType::Color2DArray:
         return vk::ImageType::e2D;
diff --git a/src/video_core/texture_cache/image_view.cpp b/src/video_core/texture_cache/image_view.cpp
index 08be6bdc..00c3833f 100644
--- a/src/video_core/texture_cache/image_view.cpp
+++ b/src/video_core/texture_cache/image_view.cpp
@@ -17,6 +17,7 @@ vk::ImageViewType ConvertImageViewType(AmdGpu::ImageType type) {
     case AmdGpu::ImageType::Color1DArray:
         return vk::ImageViewType::e1DArray;
     case AmdGpu::ImageType::Color2D:
+    case AmdGpu::ImageType::Color2DMsaa:
         return vk::ImageViewType::e2D;
     case AmdGpu::ImageType::Cube:
         return vk::ImageViewType::eCube;