diff options
| author | 2018-11-13 03:34:54 +0100 | |
|---|---|---|
| committer | 2018-11-12 18:34:54 -0800 | |
| commit | c8b3f09876e796f3c249f17f7f39e78bc1e3de74 (patch) | |
| tree | f472a868f338f3ed37def141165b75ff2bca5f25 /src/video_core/textures/decoders.cpp | |
| parent | Merge pull request #1650 from FreddyFunk/cast (diff) | |
| download | yuzu-c8b3f09876e796f3c249f17f7f39e78bc1e3de74.tar.gz yuzu-c8b3f09876e796f3c249f17f7f39e78bc1e3de74.tar.xz yuzu-c8b3f09876e796f3c249f17f7f39e78bc1e3de74.zip | |
Implement ASTC_2D_10X8 & ASTC_2D_10X8_SRGB (#1666)
* Implement ASTC_2D_10X8 & ASTC_2D_10X8_SRGB
( needed by Mario+Rabbids Kingdom Battle )
* Small placement correction
Diffstat (limited to 'src/video_core/textures/decoders.cpp')
| -rw-r--r-- | src/video_core/textures/decoders.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp index 3066abf61..a9d134d14 100644 --- a/src/video_core/textures/decoders.cpp +++ b/src/video_core/textures/decoders.cpp | |||
| @@ -202,6 +202,8 @@ u32 BytesPerPixel(TextureFormat format) { | |||
| 202 | case TextureFormat::ASTC_2D_5X4: | 202 | case TextureFormat::ASTC_2D_5X4: |
| 203 | case TextureFormat::ASTC_2D_8X8: | 203 | case TextureFormat::ASTC_2D_8X8: |
| 204 | case TextureFormat::ASTC_2D_8X5: | 204 | case TextureFormat::ASTC_2D_8X5: |
| 205 | case TextureFormat::ASTC_2D_10X8: | ||
| 206 | case TextureFormat::ASTC_2D_5X5: | ||
| 205 | case TextureFormat::A8R8G8B8: | 207 | case TextureFormat::A8R8G8B8: |
| 206 | case TextureFormat::A2B10G10R10: | 208 | case TextureFormat::A2B10G10R10: |
| 207 | case TextureFormat::BF10GF11RF11: | 209 | case TextureFormat::BF10GF11RF11: |
| @@ -294,6 +296,8 @@ std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat | |||
| 294 | case TextureFormat::BC6H_SF16: | 296 | case TextureFormat::BC6H_SF16: |
| 295 | case TextureFormat::ASTC_2D_4X4: | 297 | case TextureFormat::ASTC_2D_4X4: |
| 296 | case TextureFormat::ASTC_2D_8X8: | 298 | case TextureFormat::ASTC_2D_8X8: |
| 299 | case TextureFormat::ASTC_2D_5X5: | ||
| 300 | case TextureFormat::ASTC_2D_10X8: | ||
| 297 | case TextureFormat::A8R8G8B8: | 301 | case TextureFormat::A8R8G8B8: |
| 298 | case TextureFormat::A2B10G10R10: | 302 | case TextureFormat::A2B10G10R10: |
| 299 | case TextureFormat::A1B5G5R5: | 303 | case TextureFormat::A1B5G5R5: |