From a1c9ac7845395c250a78fc8df93a9ffed29f3d5b Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Thu, 5 Jan 2017 20:11:23 -0200 Subject: VideoCore: Move LookupTexture out of debug_utils.h --- src/video_core/texture/texture_decode.cpp | 270 ++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) create mode 100644 src/video_core/texture/texture_decode.cpp (limited to 'src/video_core/texture/texture_decode.cpp') diff --git a/src/video_core/texture/texture_decode.cpp b/src/video_core/texture/texture_decode.cpp new file mode 100644 index 000000000..a3b05fe81 --- /dev/null +++ b/src/video_core/texture/texture_decode.cpp @@ -0,0 +1,270 @@ +// Copyright 2017 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include "common/assert.h" +#include "common/color.h" +#include "common/logging/log.h" +#include "common/math_util.h" +#include "common/vector_math.h" +#include "video_core/texture/texture_decode.h" +#include "video_core/utils.h" + +namespace Pica { +namespace Texture { + +Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& info, + bool disable_alpha) { + const unsigned int coarse_x = x & ~7; + const unsigned int coarse_y = y & ~7; + + if (info.format != Regs::TextureFormat::ETC1 && info.format != Regs::TextureFormat::ETC1A4) { + // TODO(neobrain): Fix code design to unify vertical block offsets! + source += coarse_y * info.stride; + } + + // TODO: Assert that width/height are multiples of block dimensions + + switch (info.format) { + case Regs::TextureFormat::RGBA8: { + auto res = Color::DecodeRGBA8(source + VideoCore::GetMortonOffset(x, y, 4)); + return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; + } + + case Regs::TextureFormat::RGB8: { + auto res = Color::DecodeRGB8(source + VideoCore::GetMortonOffset(x, y, 3)); + return {res.r(), res.g(), res.b(), 255}; + } + + case Regs::TextureFormat::RGB5A1: { + auto res = Color::DecodeRGB5A1(source + VideoCore::GetMortonOffset(x, y, 2)); + return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; + } + + case Regs::TextureFormat::RGB565: { + auto res = Color::DecodeRGB565(source + VideoCore::GetMortonOffset(x, y, 2)); + return {res.r(), res.g(), res.b(), 255}; + } + + case Regs::TextureFormat::RGBA4: { + auto res = Color::DecodeRGBA4(source + VideoCore::GetMortonOffset(x, y, 2)); + return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; + } + + case Regs::TextureFormat::IA8: { + const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 2); + + if (disable_alpha) { + // Show intensity as red, alpha as green + return {source_ptr[1], source_ptr[0], 0, 255}; + } else { + return {source_ptr[1], source_ptr[1], source_ptr[1], source_ptr[0]}; + } + } + + case Regs::TextureFormat::RG8: { + auto res = Color::DecodeRG8(source + VideoCore::GetMortonOffset(x, y, 2)); + return {res.r(), res.g(), 0, 255}; + } + + case Regs::TextureFormat::I8: { + const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); + return {*source_ptr, *source_ptr, *source_ptr, 255}; + } + + case Regs::TextureFormat::A8: { + const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); + + if (disable_alpha) { + return {*source_ptr, *source_ptr, *source_ptr, 255}; + } else { + return {0, 0, 0, *source_ptr}; + } + } + + case Regs::TextureFormat::IA4: { + const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); + + u8 i = Color::Convert4To8(((*source_ptr) & 0xF0) >> 4); + u8 a = Color::Convert4To8((*source_ptr) & 0xF); + + if (disable_alpha) { + // Show intensity as red, alpha as green + return {i, a, 0, 255}; + } else { + return {i, i, i, a}; + } + } + + case Regs::TextureFormat::I4: { + u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); + const u8* source_ptr = source + morton_offset / 2; + + u8 i = (morton_offset % 2) ? ((*source_ptr & 0xF0) >> 4) : (*source_ptr & 0xF); + i = Color::Convert4To8(i); + + return {i, i, i, 255}; + } + + case Regs::TextureFormat::A4: { + u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); + const u8* source_ptr = source + morton_offset / 2; + + u8 a = (morton_offset % 2) ? ((*source_ptr & 0xF0) >> 4) : (*source_ptr & 0xF); + a = Color::Convert4To8(a); + + if (disable_alpha) { + return {a, a, a, 255}; + } else { + return {0, 0, 0, a}; + } + } + + case Regs::TextureFormat::ETC1: + case Regs::TextureFormat::ETC1A4: { + bool has_alpha = (info.format == Regs::TextureFormat::ETC1A4); + + // ETC1 further subdivides each 8x8 tile into four 4x4 subtiles + const int subtile_width = 4; + const int subtile_height = 4; + + int subtile_index = ((x / subtile_width) & 1) + 2 * ((y / subtile_height) & 1); + unsigned subtile_bytes = has_alpha ? 2 : 1; // TODO: Name... + + const u64* source_ptr = (const u64*)(source + coarse_x * subtile_bytes * 4 + + coarse_y * subtile_bytes * 4 * (info.width / 8) + + subtile_index * subtile_bytes * 8); + u64 alpha = 0xFFFFFFFFFFFFFFFF; + if (has_alpha) { + alpha = *source_ptr; + source_ptr++; + } + + union ETC1Tile { + // Each of these two is a collection of 16 bits (one per lookup value) + BitField<0, 16, u64> table_subindexes; + BitField<16, 16, u64> negation_flags; + + unsigned GetTableSubIndex(unsigned index) const { + return (table_subindexes >> index) & 1; + } + + bool GetNegationFlag(unsigned index) const { + return ((negation_flags >> index) & 1) == 1; + } + + BitField<32, 1, u64> flip; + BitField<33, 1, u64> differential_mode; + + BitField<34, 3, u64> table_index_2; + BitField<37, 3, u64> table_index_1; + + union { + // delta value + base value + BitField<40, 3, s64> db; + BitField<43, 5, u64> b; + + BitField<48, 3, s64> dg; + BitField<51, 5, u64> g; + + BitField<56, 3, s64> dr; + BitField<59, 5, u64> r; + } differential; + + union { + BitField<40, 4, u64> b2; + BitField<44, 4, u64> b1; + + BitField<48, 4, u64> g2; + BitField<52, 4, u64> g1; + + BitField<56, 4, u64> r2; + BitField<60, 4, u64> r1; + } separate; + + const Math::Vec3 GetRGB(int x, int y) const { + int texel = 4 * x + y; + + if (flip) + std::swap(x, y); + + // Lookup base value + Math::Vec3 ret; + if (differential_mode) { + ret.r() = static_cast(differential.r); + ret.g() = static_cast(differential.g); + ret.b() = static_cast(differential.b); + if (x >= 2) { + ret.r() += static_cast(differential.dr); + ret.g() += static_cast(differential.dg); + ret.b() += static_cast(differential.db); + } + ret.r() = Color::Convert5To8(ret.r()); + ret.g() = Color::Convert5To8(ret.g()); + ret.b() = Color::Convert5To8(ret.b()); + } else { + if (x < 2) { + ret.r() = Color::Convert4To8(static_cast(separate.r1)); + ret.g() = Color::Convert4To8(static_cast(separate.g1)); + ret.b() = Color::Convert4To8(static_cast(separate.b1)); + } else { + ret.r() = Color::Convert4To8(static_cast(separate.r2)); + ret.g() = Color::Convert4To8(static_cast(separate.g2)); + ret.b() = Color::Convert4To8(static_cast(separate.b2)); + } + } + + // Add modifier + unsigned table_index = + static_cast((x < 2) ? table_index_1.Value() : table_index_2.Value()); + + static const std::array, 8> etc1_modifier_table = {{ + {{2, 8}}, + {{5, 17}}, + {{9, 29}}, + {{13, 42}}, + {{18, 60}}, + {{24, 80}}, + {{33, 106}}, + {{47, 183}}, + }}; + + int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel)); + if (GetNegationFlag(texel)) + modifier *= -1; + + ret.r() = MathUtil::Clamp(ret.r() + modifier, 0, 255); + ret.g() = MathUtil::Clamp(ret.g() + modifier, 0, 255); + ret.b() = MathUtil::Clamp(ret.b() + modifier, 0, 255); + + return ret.Cast(); + } + } const* etc1_tile = reinterpret_cast(source_ptr); + + alpha >>= 4 * ((x & 3) * 4 + (y & 3)); + return Math::MakeVec(etc1_tile->GetRGB(x & 3, y & 3), + disable_alpha ? (u8)255 : Color::Convert4To8(alpha & 0xF)); + } + + default: + LOG_ERROR(HW_GPU, "Unknown texture format: %x", (u32)info.format); + DEBUG_ASSERT(false); + return {}; + } +} + +TextureInfo TextureInfo::FromPicaRegister(const Regs::TextureConfig& config, + const Regs::TextureFormat& format) { + TextureInfo info; + info.physical_address = config.GetPhysicalAddress(); + info.width = config.width; + info.height = config.height; + info.format = format; + info.stride = Pica::Regs::NibblesPerPixel(info.format) * info.width / 2; + return info; +} + +} // namespace Texture +} // namespace Pica -- cgit v1.2.3 From 09a750e8662e5d4d608177fdfb69b398c3202cd6 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 6 Jan 2017 01:19:06 -0200 Subject: Pica/Texture: Simplify/cleanup texture tile addressing --- src/video_core/texture/texture_decode.cpp | 108 ++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 28 deletions(-) (limited to 'src/video_core/texture/texture_decode.cpp') diff --git a/src/video_core/texture/texture_decode.cpp b/src/video_core/texture/texture_decode.cpp index a3b05fe81..f13d6e577 100644 --- a/src/video_core/texture/texture_decode.cpp +++ b/src/video_core/texture/texture_decode.cpp @@ -9,52 +9,104 @@ #include "common/logging/log.h" #include "common/math_util.h" #include "common/vector_math.h" +#include "video_core/pica.h" #include "video_core/texture/texture_decode.h" #include "video_core/utils.h" +using TextureFormat = Pica::Regs::TextureFormat; + namespace Pica { namespace Texture { -Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& info, - bool disable_alpha) { - const unsigned int coarse_x = x & ~7; - const unsigned int coarse_y = y & ~7; +constexpr size_t TILE_SIZE = 8 * 8; +constexpr size_t ETC1_SUBTILES = 2 * 2; + +size_t CalculateTileSize(TextureFormat format) { + switch (format) { + case TextureFormat::RGBA8: + return 4 * TILE_SIZE; + + case TextureFormat::RGB8: + return 3 * TILE_SIZE; + + case TextureFormat::RGB5A1: + case TextureFormat::RGB565: + case TextureFormat::RGBA4: + case TextureFormat::IA8: + case TextureFormat::RG8: + return 2 * TILE_SIZE; + + case TextureFormat::I8: + case TextureFormat::A8: + case TextureFormat::IA4: + return 1 * TILE_SIZE; + + case TextureFormat::I4: + case TextureFormat::A4: + return TILE_SIZE / 2; + + case TextureFormat::ETC1: + return ETC1_SUBTILES * 8; + + case TextureFormat::ETC1A4: + return ETC1_SUBTILES * 16; - if (info.format != Regs::TextureFormat::ETC1 && info.format != Regs::TextureFormat::ETC1A4) { - // TODO(neobrain): Fix code design to unify vertical block offsets! - source += coarse_y * info.stride; + default: // placeholder for yet unknown formats + UNIMPLEMENTED(); + return 0; } +} + +Math::Vec4 LookupTexture(const u8* source, unsigned int x, unsigned int y, + const TextureInfo& info, bool disable_alpha) { + // Coordinate in tiles + const unsigned int coarse_x = x / 8; + const unsigned int coarse_y = y / 8; - // TODO: Assert that width/height are multiples of block dimensions + // Coordinate inside the tile + const unsigned int fine_x = x % 8; + const unsigned int fine_y = y % 8; + + const u8* line = source + coarse_y * info.stride; + const u8* tile = line + coarse_x * CalculateTileSize(info.format); + return LookupTexelInTile(tile, fine_x, fine_y, info, disable_alpha); +} + +Math::Vec4 LookupTexelInTile(const u8* source, unsigned int x, unsigned int y, + const TextureInfo& info, bool disable_alpha) { + DEBUG_ASSERT(x < 8); + DEBUG_ASSERT(y < 8); + + using VideoCore::MortonInterleave; switch (info.format) { case Regs::TextureFormat::RGBA8: { - auto res = Color::DecodeRGBA8(source + VideoCore::GetMortonOffset(x, y, 4)); + auto res = Color::DecodeRGBA8(source + MortonInterleave(x, y) * 4); return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; } case Regs::TextureFormat::RGB8: { - auto res = Color::DecodeRGB8(source + VideoCore::GetMortonOffset(x, y, 3)); + auto res = Color::DecodeRGB8(source + MortonInterleave(x, y) * 3); return {res.r(), res.g(), res.b(), 255}; } case Regs::TextureFormat::RGB5A1: { - auto res = Color::DecodeRGB5A1(source + VideoCore::GetMortonOffset(x, y, 2)); + auto res = Color::DecodeRGB5A1(source + MortonInterleave(x, y) * 2); return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; } case Regs::TextureFormat::RGB565: { - auto res = Color::DecodeRGB565(source + VideoCore::GetMortonOffset(x, y, 2)); + auto res = Color::DecodeRGB565(source + MortonInterleave(x, y) * 2); return {res.r(), res.g(), res.b(), 255}; } case Regs::TextureFormat::RGBA4: { - auto res = Color::DecodeRGBA4(source + VideoCore::GetMortonOffset(x, y, 2)); + auto res = Color::DecodeRGBA4(source + MortonInterleave(x, y) * 2); return {res.r(), res.g(), res.b(), static_cast(disable_alpha ? 255 : res.a())}; } case Regs::TextureFormat::IA8: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 2); + const u8* source_ptr = source + MortonInterleave(x, y) * 2; if (disable_alpha) { // Show intensity as red, alpha as green @@ -65,17 +117,17 @@ Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& } case Regs::TextureFormat::RG8: { - auto res = Color::DecodeRG8(source + VideoCore::GetMortonOffset(x, y, 2)); + auto res = Color::DecodeRG8(source + MortonInterleave(x, y) * 2); return {res.r(), res.g(), 0, 255}; } case Regs::TextureFormat::I8: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); + const u8* source_ptr = source + MortonInterleave(x, y); return {*source_ptr, *source_ptr, *source_ptr, 255}; } case Regs::TextureFormat::A8: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); + const u8* source_ptr = source + MortonInterleave(x, y); if (disable_alpha) { return {*source_ptr, *source_ptr, *source_ptr, 255}; @@ -85,7 +137,7 @@ Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& } case Regs::TextureFormat::IA4: { - const u8* source_ptr = source + VideoCore::GetMortonOffset(x, y, 1); + const u8* source_ptr = source + MortonInterleave(x, y); u8 i = Color::Convert4To8(((*source_ptr) & 0xF0) >> 4); u8 a = Color::Convert4To8((*source_ptr) & 0xF); @@ -99,7 +151,7 @@ Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& } case Regs::TextureFormat::I4: { - u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); + u32 morton_offset = MortonInterleave(x, y); const u8* source_ptr = source + morton_offset / 2; u8 i = (morton_offset % 2) ? ((*source_ptr & 0xF0) >> 4) : (*source_ptr & 0xF); @@ -109,7 +161,7 @@ Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& } case Regs::TextureFormat::A4: { - u32 morton_offset = VideoCore::GetMortonOffset(x, y, 1); + u32 morton_offset = MortonInterleave(x, y); const u8* source_ptr = source + morton_offset / 2; u8 a = (morton_offset % 2) ? ((*source_ptr & 0xF0) >> 4) : (*source_ptr & 0xF); @@ -127,15 +179,15 @@ Math::Vec4 LookupTexture(const u8* source, int x, int y, const TextureInfo& bool has_alpha = (info.format == Regs::TextureFormat::ETC1A4); // ETC1 further subdivides each 8x8 tile into four 4x4 subtiles - const int subtile_width = 4; - const int subtile_height = 4; + constexpr unsigned int subtile_width = 4; + constexpr unsigned int subtile_height = 4; + + unsigned int subtile_index = (x / subtile_width) + 2 * (y / subtile_height); + size_t subtile_size = has_alpha ? 16 : 8; - int subtile_index = ((x / subtile_width) & 1) + 2 * ((y / subtile_height) & 1); - unsigned subtile_bytes = has_alpha ? 2 : 1; // TODO: Name... + // TODO(yuriks): Use memcpy instead of reinterpret_cast + const u64* source_ptr = reinterpret_cast(source + subtile_index * subtile_size); - const u64* source_ptr = (const u64*)(source + coarse_x * subtile_bytes * 4 + - coarse_y * subtile_bytes * 4 * (info.width / 8) + - subtile_index * subtile_bytes * 8); u64 alpha = 0xFFFFFFFFFFFFFFFF; if (has_alpha) { alpha = *source_ptr; @@ -262,7 +314,7 @@ TextureInfo TextureInfo::FromPicaRegister(const Regs::TextureConfig& config, info.width = config.width; info.height = config.height; info.format = format; - info.stride = Pica::Regs::NibblesPerPixel(info.format) * info.width / 2; + info.SetDefaultStride(); return info; } -- cgit v1.2.3 From c74787a11c44bd1fa444425d36ac3049dffe1496 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 6 Jan 2017 01:59:34 -0200 Subject: Pica/Texture: Move part of ETC1 decoding to new file and cleanups --- src/video_core/texture/texture_decode.cpp | 127 ++++-------------------------- 1 file changed, 17 insertions(+), 110 deletions(-) (limited to 'src/video_core/texture/texture_decode.cpp') diff --git a/src/video_core/texture/texture_decode.cpp b/src/video_core/texture/texture_decode.cpp index f13d6e577..f611a1aa9 100644 --- a/src/video_core/texture/texture_decode.cpp +++ b/src/video_core/texture/texture_decode.cpp @@ -8,8 +8,10 @@ #include "common/color.h" #include "common/logging/log.h" #include "common/math_util.h" +#include "common/swap.h" #include "common/vector_math.h" #include "video_core/pica.h" +#include "video_core/texture/etc1.h" #include "video_core/texture/texture_decode.h" #include "video_core/utils.h" @@ -177,127 +179,32 @@ Math::Vec4 LookupTexelInTile(const u8* source, unsigned int x, unsigned int case Regs::TextureFormat::ETC1: case Regs::TextureFormat::ETC1A4: { bool has_alpha = (info.format == Regs::TextureFormat::ETC1A4); + size_t subtile_size = has_alpha ? 16 : 8; // ETC1 further subdivides each 8x8 tile into four 4x4 subtiles constexpr unsigned int subtile_width = 4; constexpr unsigned int subtile_height = 4; unsigned int subtile_index = (x / subtile_width) + 2 * (y / subtile_height); - size_t subtile_size = has_alpha ? 16 : 8; + x %= subtile_width; + y %= subtile_height; - // TODO(yuriks): Use memcpy instead of reinterpret_cast - const u64* source_ptr = reinterpret_cast(source + subtile_index * subtile_size); + const u8* subtile_ptr = source + subtile_index * subtile_size; - u64 alpha = 0xFFFFFFFFFFFFFFFF; + u8 alpha = 255; if (has_alpha) { - alpha = *source_ptr; - source_ptr++; + u64_le packed_alpha; + memcpy(&packed_alpha, subtile_ptr, sizeof(u64)); + subtile_ptr += sizeof(u64); + + alpha = Color::Convert4To8((packed_alpha >> (4 * (x * subtile_width + y))) & 0xF); } - union ETC1Tile { - // Each of these two is a collection of 16 bits (one per lookup value) - BitField<0, 16, u64> table_subindexes; - BitField<16, 16, u64> negation_flags; - - unsigned GetTableSubIndex(unsigned index) const { - return (table_subindexes >> index) & 1; - } - - bool GetNegationFlag(unsigned index) const { - return ((negation_flags >> index) & 1) == 1; - } - - BitField<32, 1, u64> flip; - BitField<33, 1, u64> differential_mode; - - BitField<34, 3, u64> table_index_2; - BitField<37, 3, u64> table_index_1; - - union { - // delta value + base value - BitField<40, 3, s64> db; - BitField<43, 5, u64> b; - - BitField<48, 3, s64> dg; - BitField<51, 5, u64> g; - - BitField<56, 3, s64> dr; - BitField<59, 5, u64> r; - } differential; - - union { - BitField<40, 4, u64> b2; - BitField<44, 4, u64> b1; - - BitField<48, 4, u64> g2; - BitField<52, 4, u64> g1; - - BitField<56, 4, u64> r2; - BitField<60, 4, u64> r1; - } separate; - - const Math::Vec3 GetRGB(int x, int y) const { - int texel = 4 * x + y; - - if (flip) - std::swap(x, y); - - // Lookup base value - Math::Vec3 ret; - if (differential_mode) { - ret.r() = static_cast(differential.r); - ret.g() = static_cast(differential.g); - ret.b() = static_cast(differential.b); - if (x >= 2) { - ret.r() += static_cast(differential.dr); - ret.g() += static_cast(differential.dg); - ret.b() += static_cast(differential.db); - } - ret.r() = Color::Convert5To8(ret.r()); - ret.g() = Color::Convert5To8(ret.g()); - ret.b() = Color::Convert5To8(ret.b()); - } else { - if (x < 2) { - ret.r() = Color::Convert4To8(static_cast(separate.r1)); - ret.g() = Color::Convert4To8(static_cast(separate.g1)); - ret.b() = Color::Convert4To8(static_cast(separate.b1)); - } else { - ret.r() = Color::Convert4To8(static_cast(separate.r2)); - ret.g() = Color::Convert4To8(static_cast(separate.g2)); - ret.b() = Color::Convert4To8(static_cast(separate.b2)); - } - } - - // Add modifier - unsigned table_index = - static_cast((x < 2) ? table_index_1.Value() : table_index_2.Value()); - - static const std::array, 8> etc1_modifier_table = {{ - {{2, 8}}, - {{5, 17}}, - {{9, 29}}, - {{13, 42}}, - {{18, 60}}, - {{24, 80}}, - {{33, 106}}, - {{47, 183}}, - }}; - - int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel)); - if (GetNegationFlag(texel)) - modifier *= -1; - - ret.r() = MathUtil::Clamp(ret.r() + modifier, 0, 255); - ret.g() = MathUtil::Clamp(ret.g() + modifier, 0, 255); - ret.b() = MathUtil::Clamp(ret.b() + modifier, 0, 255); - - return ret.Cast(); - } - } const* etc1_tile = reinterpret_cast(source_ptr); - - alpha >>= 4 * ((x & 3) * 4 + (y & 3)); - return Math::MakeVec(etc1_tile->GetRGB(x & 3, y & 3), - disable_alpha ? (u8)255 : Color::Convert4To8(alpha & 0xF)); + u64_le subtile_data; + memcpy(&subtile_data, subtile_ptr, sizeof(u64)); + + return Math::MakeVec(SampleETC1Subtile(subtile_data, x, y), + disable_alpha ? (u8)255 : alpha); } default: -- cgit v1.2.3