summaryrefslogtreecommitdiffstats
path: root/src/video_core/textures
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-05-27 16:02:05 +0200
committerSubv <subv2112@gmail.com>2018-05-27 16:02:05 +0200
commit7ddc872b529192fd822c1d759ccfac2398b6ca2a (patch)
tree5f839f0f1337359b2a3bb66c2e9d0d8b3d268ff0 /src/video_core/textures
parentAdd & correct miscellaneous things (#470) (diff)
downloadyuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar
yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.gz
yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.bz2
yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.lz
yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.xz
yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.tar.zst
yuzu-7ddc872b529192fd822c1d759ccfac2398b6ca2a.zip
Diffstat (limited to 'src/video_core/textures')
-rw-r--r--src/video_core/textures/decoders.cpp3
-rw-r--r--src/video_core/textures/texture.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp
index 8b39b2bdf..ceb760e0f 100644
--- a/src/video_core/textures/decoders.cpp
+++ b/src/video_core/textures/decoders.cpp
@@ -55,6 +55,7 @@ u32 BytesPerPixel(TextureFormat format) {
case TextureFormat::A8R8G8B8:
case TextureFormat::A2B10G10R10:
return 4;
+ case TextureFormat::A1B5G5R5:
case TextureFormat::B5G6R5:
return 2;
default:
@@ -80,6 +81,7 @@ std::vector<u8> UnswizzleTexture(VAddr address, TextureFormat format, u32 width,
break;
case TextureFormat::A8R8G8B8:
case TextureFormat::A2B10G10R10:
+ case TextureFormat::A1B5G5R5:
case TextureFormat::B5G6R5:
CopySwizzledData(width, height, bytes_per_pixel, bytes_per_pixel, data,
unswizzled_data.data(), true, block_height);
@@ -103,6 +105,7 @@ std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat
case TextureFormat::DXT45:
case TextureFormat::A8R8G8B8:
case TextureFormat::A2B10G10R10:
+ case TextureFormat::A1B5G5R5:
case TextureFormat::B5G6R5:
// TODO(Subv): For the time being just forward the same data without any decoding.
rgba_data = texture_data;
diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h
index dc004d361..b33e9bab3 100644
--- a/src/video_core/textures/texture.h
+++ b/src/video_core/textures/texture.h
@@ -16,6 +16,7 @@ namespace Texture {
enum class TextureFormat : u32 {
A8R8G8B8 = 0x8,
A2B10G10R10 = 0x9,
+ A1B5G5R5 = 0x14,
B5G6R5 = 0x15,
DXT1 = 0x24,
DXT23 = 0x25,