diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-19 02:20:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 02:20:51 +0200 |
| commit | 60e6e8953ef764eb2db46d336623831e6f0cc193 (patch) | |
| tree | 35588db31eb7b9cfe98954c214dbb14df42e8ac2 /src/video_core/textures | |
| parent | gl_shader_gen: Support vertical/horizontal viewport flipping. (#347) (diff) | |
| parent | GPU: Implemented the B5G6R5 format. (diff) | |
| download | yuzu-60e6e8953ef764eb2db46d336623831e6f0cc193.tar yuzu-60e6e8953ef764eb2db46d336623831e6f0cc193.tar.gz yuzu-60e6e8953ef764eb2db46d336623831e6f0cc193.tar.bz2 yuzu-60e6e8953ef764eb2db46d336623831e6f0cc193.tar.lz yuzu-60e6e8953ef764eb2db46d336623831e6f0cc193.tar.xz yuzu-60e6e8953ef764eb2db46d336623831e6f0cc193.tar.zst yuzu-60e6e8953ef764eb2db46d336623831e6f0cc193.zip | |
Diffstat (limited to 'src/video_core/textures')
| -rw-r--r-- | src/video_core/textures/decoders.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/textures/texture.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp index 9c2a10d2e..f4c7e40df 100644 --- a/src/video_core/textures/decoders.cpp +++ b/src/video_core/textures/decoders.cpp @@ -50,6 +50,8 @@ u32 BytesPerPixel(TextureFormat format) { return 8; case TextureFormat::A8R8G8B8: return 4; + case TextureFormat::B5G6R5: + return 2; default: UNIMPLEMENTED_MSG("Format not implemented"); break; @@ -70,6 +72,7 @@ std::vector<u8> UnswizzleTexture(VAddr address, TextureFormat format, u32 width, unswizzled_data.data(), true, block_height); break; case TextureFormat::A8R8G8B8: + case TextureFormat::B5G6R5: CopySwizzledData(width, height, bytes_per_pixel, bytes_per_pixel, data, unswizzled_data.data(), true, block_height); break; @@ -89,6 +92,7 @@ std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat switch (format) { case TextureFormat::DXT1: case TextureFormat::A8R8G8B8: + case TextureFormat::B5G6R5: // TODO(Subv): For the time being just forward the same data without any decoding. rgba_data = texture_data; break; diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h index 09d2317e0..86e45aa88 100644 --- a/src/video_core/textures/texture.h +++ b/src/video_core/textures/texture.h @@ -15,6 +15,7 @@ namespace Texture { enum class TextureFormat : u32 { A8R8G8B8 = 0x8, + B5G6R5 = 0x15, DXT1 = 0x24, DXT23 = 0x25, DXT45 = 0x26, |