Merge pull request #10142 from FernandoS27/missing-astc

GPU: implement missing ASTC

2 files changed, 12 insertions, 0 deletions

diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp
index 5fc2b2fec..11ced6c38 100644
--- a/src/video_core/texture_cache/format_lookup_table.cpp
+++ b/src/video_core/texture_cache/format_lookup_table.cpp
@@ -210,6 +210,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red,
         return PixelFormat::ASTC_2D_6X6_SRGB;
     case Hash(TextureFormat::ASTC_2D_10X6, UNORM, LINEAR):
         return PixelFormat::ASTC_2D_10X6_UNORM;
+    case Hash(TextureFormat::ASTC_2D_10X6, UNORM, SRGB):
+        return PixelFormat::ASTC_2D_10X6_SRGB;
     case Hash(TextureFormat::ASTC_2D_10X5, UNORM, LINEAR):
         return PixelFormat::ASTC_2D_10X5_UNORM;
     case Hash(TextureFormat::ASTC_2D_10X5, UNORM, SRGB):
@@ -218,6 +220,10 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red,
         return PixelFormat::ASTC_2D_10X10_UNORM;
     case Hash(TextureFormat::ASTC_2D_10X10, UNORM, SRGB):
         return PixelFormat::ASTC_2D_10X10_SRGB;
+    case Hash(TextureFormat::ASTC_2D_12X10, UNORM, LINEAR):
+        return PixelFormat::ASTC_2D_12X10_UNORM;
+    case Hash(TextureFormat::ASTC_2D_12X10, UNORM, SRGB):
+        return PixelFormat::ASTC_2D_12X10_SRGB;
     case Hash(TextureFormat::ASTC_2D_12X12, UNORM, LINEAR):
         return PixelFormat::ASTC_2D_12X12_UNORM;
     case Hash(TextureFormat::ASTC_2D_12X12, UNORM, SRGB):
diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h
index f1f0a057b..b97147797 100644
--- a/src/video_core/texture_cache/formatter.h
+++ b/src/video_core/texture_cache/formatter.h
@@ -179,6 +179,8 @@ struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::str
                 return "ASTC_2D_6X6_SRGB";
             case PixelFormat::ASTC_2D_10X6_UNORM:
                 return "ASTC_2D_10X6_UNORM";
+            case PixelFormat::ASTC_2D_10X6_SRGB:
+                return "ASTC_2D_10X6_SRGB";
             case PixelFormat::ASTC_2D_10X5_UNORM:
                 return "ASTC_2D_10X5_UNORM";
             case PixelFormat::ASTC_2D_10X5_SRGB:
@@ -187,6 +189,10 @@ struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::str
                 return "ASTC_2D_10X10_UNORM";
             case PixelFormat::ASTC_2D_10X10_SRGB:
                 return "ASTC_2D_10X10_SRGB";
+            case PixelFormat::ASTC_2D_12X10_UNORM:
+                return "ASTC_2D_12X10_UNORM";
+            case PixelFormat::ASTC_2D_12X10_SRGB:
+                return "ASTC_2D_12X10_SRGB";
             case PixelFormat::ASTC_2D_12X12_UNORM:
                 return "ASTC_2D_12X12_UNORM";
             case PixelFormat::ASTC_2D_12X12_SRGB: