VERY experimental Nintendo Switch 2 emulator
C++
video_core: vk_swapchain: Fix image format for Android.
bunneif6f470fb4bda
diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cppindex df948292f7..e4c581a283 100644--- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp+++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp@@ -449,7 +449,12 @@ void BlitScreen::DrawToSwapchain(Frame* frame, const Tegra::FramebufferConfig& fif (const std::size_t swapchain_images = swapchain.GetImageCount();swapchain_images != image_count || current_srgb != is_srgb) {current_srgb = is_srgb;+#ifdef ANDROID+ // Android is already ordered the same as Switch.+ image_view_format = current_srgb ? VK_FORMAT_R8G8B8A8_SRGB : VK_FORMAT_R8G8B8A8_UNORM;+#elseimage_view_format = current_srgb ? VK_FORMAT_B8G8R8A8_SRGB : VK_FORMAT_B8G8R8A8_UNORM;+#endifimage_count = swapchain_images;Recreate();}diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cppindex 8c0dec5900..e43a993f91 100644--- a/src/video_core/renderer_vulkan/vk_swapchain.cpp+++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp@@ -266,7 +266,12 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, boimages = swapchain.GetImages();image_count = static_cast<u32>(images.size());+#ifdef ANDROID+ // Android is already ordered the same as Switch.+ image_view_format = srgb ? VK_FORMAT_R8G8B8A8_SRGB : VK_FORMAT_R8G8B8A8_UNORM;+#elseimage_view_format = srgb ? VK_FORMAT_B8G8R8A8_SRGB : VK_FORMAT_B8G8R8A8_UNORM;+#endif}void Swapchain::CreateSemaphores() {