diff options
| author | 2022-07-10 13:16:23 +0200 | |
|---|---|---|
| committer | 2022-07-10 13:16:23 +0200 | |
| commit | 6c72b7f01109300f98a7ba6465285657f330df4c (patch) | |
| tree | a6662d424de9e4e420e0cca15d41e02056ad58fa /src/video_core/texture_cache | |
| parent | Merge pull request #8561 from Kelebek1/Audio-CoreTiming (diff) | |
| parent | renderer_(gl/vk): Implement ASTC_10x6_UNORM (diff) | |
| download | yuzu-6c72b7f01109300f98a7ba6465285657f330df4c.tar.gz yuzu-6c72b7f01109300f98a7ba6465285657f330df4c.tar.xz yuzu-6c72b7f01109300f98a7ba6465285657f330df4c.zip | |
Merge pull request #8528 from Morph1984/astc10x6
renderer_(gl/vk): Implement ASTC_10x6_UNORM
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/format_lookup_table.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/formatter.h | 2 |
2 files changed, 4 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 0937768d6..1412aa076 100644 --- a/src/video_core/texture_cache/format_lookup_table.cpp +++ b/src/video_core/texture_cache/format_lookup_table.cpp | |||
| @@ -206,6 +206,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, | |||
| 206 | return PixelFormat::ASTC_2D_6X6_UNORM; | 206 | return PixelFormat::ASTC_2D_6X6_UNORM; |
| 207 | case Hash(TextureFormat::ASTC_2D_6X6, UNORM, SRGB): | 207 | case Hash(TextureFormat::ASTC_2D_6X6, UNORM, SRGB): |
| 208 | return PixelFormat::ASTC_2D_6X6_SRGB; | 208 | return PixelFormat::ASTC_2D_6X6_SRGB; |
| 209 | case Hash(TextureFormat::ASTC_2D_10X6, UNORM, LINEAR): | ||
| 210 | return PixelFormat::ASTC_2D_10X6_UNORM; | ||
| 209 | case Hash(TextureFormat::ASTC_2D_10X10, UNORM, LINEAR): | 211 | case Hash(TextureFormat::ASTC_2D_10X10, UNORM, LINEAR): |
| 210 | return PixelFormat::ASTC_2D_10X10_UNORM; | 212 | return PixelFormat::ASTC_2D_10X10_UNORM; |
| 211 | case Hash(TextureFormat::ASTC_2D_10X10, UNORM, SRGB): | 213 | case Hash(TextureFormat::ASTC_2D_10X10, UNORM, SRGB): |
diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index 1b78ed445..95a572604 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h | |||
| @@ -175,6 +175,8 @@ struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::str | |||
| 175 | return "ASTC_2D_6X6_UNORM"; | 175 | return "ASTC_2D_6X6_UNORM"; |
| 176 | case PixelFormat::ASTC_2D_6X6_SRGB: | 176 | case PixelFormat::ASTC_2D_6X6_SRGB: |
| 177 | return "ASTC_2D_6X6_SRGB"; | 177 | return "ASTC_2D_6X6_SRGB"; |
| 178 | case PixelFormat::ASTC_2D_10X6_UNORM: | ||
| 179 | return "ASTC_2D_10X6_UNORM"; | ||
| 178 | case PixelFormat::ASTC_2D_10X10_UNORM: | 180 | case PixelFormat::ASTC_2D_10X10_UNORM: |
| 179 | return "ASTC_2D_10X10_UNORM"; | 181 | return "ASTC_2D_10X10_UNORM"; |
| 180 | case PixelFormat::ASTC_2D_10X10_SRGB: | 182 | case PixelFormat::ASTC_2D_10X10_SRGB: |