[TEST] Add preliminary/ missing formats based on driver reports for Switch

src/video_core/renderer_vulkan/maxwell_to_vk.cpp

@@ -223,6 +223,10 @@ FormatInfo SurfaceFormat(const Device& device, FormatType format_type, bool with
     SURFACE_FORMAT_ELEM(VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK, 0, ETC2_RGB_SRGB) \
     SURFACE_FORMAT_ELEM(VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK, 0, ETC2_RGBA_SRGB) \
     SURFACE_FORMAT_ELEM(VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK, 0, ETC2_RGB_PTA_SRGB) \
+    SURFACE_FORMAT_ELEM(VK_FORMAT_EAC_R11_UNORM_BLOCK, 0, EAC_R11_UNORM) \
+    SURFACE_FORMAT_ELEM(VK_FORMAT_EAC_R11_SNORM_BLOCK, 0, EAC_R11_SNORM) \
+    SURFACE_FORMAT_ELEM(VK_FORMAT_EAC_R11G11_UNORM_BLOCK, 0, EAC_R11G11_UNORM) \
+    SURFACE_FORMAT_ELEM(VK_FORMAT_EAC_R11G11_SNORM_BLOCK, 0, EAC_R11G11_SNORM) \
     /* Depth formats */ \
     SURFACE_FORMAT_ELEM(VK_FORMAT_D32_SFLOAT, usage_attachable, D32_FLOAT) \
     SURFACE_FORMAT_ELEM(VK_FORMAT_D16_UNORM, usage_attachable, D16_UNORM) \
@@ -278,7 +282,17 @@ FormatInfo SurfaceFormat(const Device& device, FormatType format_type, bool with
         }
     } else if (!device.IsOptimalEtc2Supported() && VideoCore::Surface::IsPixelFormatETC2(pixel_format)) {
         // Transcode on hardware that doesn't support ETC2 natively
-        tuple.format = is_srgb ? VK_FORMAT_A8B8G8R8_SRGB_PACK32 : VK_FORMAT_A8B8G8R8_UNORM_PACK32;
+        if (pixel_format == PixelFormat::EAC_R11_SNORM) {
+            tuple.format = VK_FORMAT_R8_SNORM;
+        } else if (pixel_format == PixelFormat::EAC_R11_UNORM) {
+            tuple.format = VK_FORMAT_R8_UNORM;
+        } else if (pixel_format == PixelFormat::EAC_R11G11_SNORM) {
+            tuple.format = VK_FORMAT_R8G8_SNORM;
+        } else if (pixel_format == PixelFormat::EAC_R11G11_UNORM) {
+            tuple.format = VK_FORMAT_R8G8_UNORM;
+        } else {
+            tuple.format = is_srgb ? VK_FORMAT_A8B8G8R8_SRGB_PACK32 : VK_FORMAT_A8B8G8R8_UNORM_PACK32;
+        }
     }
     bool const attachable = (tuple.usage & usage_attachable) != 0;
     bool const storage = (tuple.usage & usage_storage) != 0;

src/video_core/surface.cpp

@@ -344,6 +344,10 @@ bool IsPixelFormatETC2(PixelFormat format) {
     case PixelFormat::ETC2_RGB_SRGB:
     case PixelFormat::ETC2_RGBA_SRGB:
     case PixelFormat::ETC2_RGB_PTA_SRGB:
+    case PixelFormat::EAC_R11_UNORM:
+    case PixelFormat::EAC_R11_SNORM:
+    case PixelFormat::EAC_R11G11_UNORM:
+    case PixelFormat::EAC_R11G11_SNORM:
         return true;
     default:
         return false;

src/video_core/surface.h

@@ -119,6 +119,10 @@ namespace VideoCore::Surface {
     PIXEL_FORMAT_ELEM(ETC2_RGB_SRGB, 4, 4, 64) \
     PIXEL_FORMAT_ELEM(ETC2_RGBA_SRGB, 4, 4, 128) \
     PIXEL_FORMAT_ELEM(ETC2_RGB_PTA_SRGB, 4, 4, 64) \
+    PIXEL_FORMAT_ELEM(EAC_R11_UNORM, 4, 4, 64) \
+    PIXEL_FORMAT_ELEM(EAC_R11_SNORM, 4, 4, 64) \
+    PIXEL_FORMAT_ELEM(EAC_R11G11_UNORM, 4, 4, 128) \
+    PIXEL_FORMAT_ELEM(EAC_R11G11_SNORM, 4, 4, 128) \
     /* Depth formats */ \
     PIXEL_FORMAT_ELEM(D32_FLOAT, 1, 1, 32) \
     PIXEL_FORMAT_ELEM(D16_UNORM, 1, 1, 16) \

src/video_core/texture_cache/format_lookup_table.cpp

@@ -204,6 +204,15 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red,
         return PixelFormat::ETC2_RGB_PTA_SRGB;
     case Hash(TextureFormat::ETC2_RGBA, UNORM, SRGB):
         return PixelFormat::ETC2_RGBA_SRGB;
+    /* EAC */
+    case Hash(TextureFormat::EAC, UNORM):
+        return PixelFormat::EAC_R11_UNORM;
+    case Hash(TextureFormat::EAC, SNORM):
+        return PixelFormat::EAC_R11_SNORM;
+    case Hash(TextureFormat::EACX2, UNORM):
+        return PixelFormat::EAC_R11G11_UNORM;
+    case Hash(TextureFormat::EACX2, SNORM):
+        return PixelFormat::EAC_R11G11_SNORM;
     /* ASTC */
     case Hash(TextureFormat::ASTC_2D_4X4, UNORM, LINEAR):
         return PixelFormat::ASTC_2D_4X4_UNORM;