encounter/aurora
1
0
Fork 0
mirror of https://github.com/encounter/aurora.git synced 2025-08-08 05:09:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-block-aligned texture decoding & TLUT decoding

Browse Source
This commit is contained in:
Luke Street 2025-04-07 20:12:16 -06:00
parent 37ae1bf9b5
commit e39ffe6429
4 changed files with 189 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gfx/texture.cpp
View File

@ -52,13 +52,19 @@ wgpu::Extent3D physical_size(wgpu::Extent3D size, TextureFormatInfo info) {
} // namespace } // namespace
TextureHandle new_static_texture_2d(uint32_t width, uint32_t height, uint32_t mips, u32 format, ArrayRef<uint8_t> data, TextureHandle new_static_texture_2d(uint32_t width, uint32_t height, uint32_t mips, u32 format, ArrayRef<uint8_t> data,
const char* label) noexcept { bool tlut, const char* label) noexcept {
auto handle = new_dynamic_texture_2d(width, height, mips, format, label); auto handle = new_dynamic_texture_2d(width, height, mips, format, label);
const auto& ref = *handle; const auto& ref = *handle;
ByteBuffer buffer; ByteBuffer buffer;
if (ref.gxFormat != InvalidTextureFormat) { if (ref.gxFormat != InvalidTextureFormat) {
if (tlut) {
CHECK(ref.size.height == 1, "new_static_texture_2d[{}]: expected tlut height 1, got {}", label, ref.size.height);
CHECK(ref.mipCount == 1, "new_static_texture_2d[{}]: expected tlut mipCount 1, got {}", label, ref.mipCount);
buffer = convert_tlut(ref.gxFormat, ref.size.width, data);
} else {
buffer = convert_texture(ref.gxFormat, ref.size.width, ref.size.height, ref.mipCount, data); buffer = convert_texture(ref.gxFormat, ref.size.width, ref.size.height, ref.mipCount, data);
}
if (!buffer.empty()) { if (!buffer.empty()) {
data = {buffer.data(), buffer.size()}; data = {buffer.data(), buffer.size()};
} }

2
lib/gfx/texture.hpp
View File

@ -36,7 +36,7 @@ struct TextureRef {
}; };
TextureHandle new_static_texture_2d(uint32_t width, uint32_t height, uint32_t mips, u32 format, ArrayRef<uint8_t> data, TextureHandle new_static_texture_2d(uint32_t width, uint32_t height, uint32_t mips, u32 format, ArrayRef<uint8_t> data,
const char* label) noexcept; bool tlut, const char* label) noexcept;
TextureHandle new_dynamic_texture_2d(uint32_t width, uint32_t height, uint32_t mips, u32 format, TextureHandle new_dynamic_texture_2d(uint32_t width, uint32_t height, uint32_t mips, u32 format,
const char* label) noexcept; const char* label) noexcept;
TextureHandle new_render_texture(uint32_t width, uint32_t height, u32 fmt, const char* label) noexcept; TextureHandle new_render_texture(uint32_t width, uint32_t height, u32 fmt, const char* label) noexcept;

385
lib/gfx/texture_convert.cpp
View File

@ -11,6 +11,7 @@ struct RGBA8 {
uint8_t b; uint8_t b;
uint8_t a; uint8_t a;
}; };
struct DXT1Block { struct DXT1Block {
uint16_t color1; uint16_t color1;
uint16_t color2; uint16_t color2;
@ -76,27 +77,39 @@ constexpr T bswap16(T val) noexcept {
#endif #endif
} }
static ByteBuffer BuildI4FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { template <typename T>
concept TextureDecoder = requires(T) {
typename T::Source;
typename T::Target;
{ T::Frac } -> std::convertible_to<uint32_t>;
{ T::BlockWidth } -> std::convertible_to<uint32_t>;
{ T::BlockHeight } -> std::convertible_to<uint32_t>;
{ T::decode_texel(std::declval<typename T::Target*>(), std::declval<const typename T::Source*>(), 0u) };
};
template <TextureDecoder T>
static ByteBuffer DecodeTiled(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) {
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); const size_t texelCount = ComputeMippedTexelCount(width, height, mips);
ByteBuffer buf{texelCount}; ByteBuffer buf{texelCount * sizeof(T::Target)};
uint32_t w = width; uint32_t w = width;
uint32_t h = height; uint32_t h = height;
uint8_t* targetMip = buf.data(); auto* targetMip = reinterpret_cast<typename T::Target*>(buf.data());
const uint8_t* in = data.data(); const auto* in = reinterpret_cast<const typename T::Source*>(data.data());
for (uint32_t mip = 0; mip < mips; ++mip) { for (uint32_t mip = 0; mip < mips; ++mip) {
const uint32_t bwidth = (w + 7) / 8; const uint32_t bwidth = (w + (T::BlockWidth - 1)) / T::BlockWidth;
const uint32_t bheight = (h + 7) / 8; const uint32_t bheight = (h + (T::BlockHeight - 1)) / T::BlockHeight;
for (uint32_t by = 0; by < bheight; ++by) { for (uint32_t by = 0; by < bheight; ++by) {
const uint32_t baseY = by * 8; const uint32_t baseY = by * T::BlockHeight;
for (uint32_t bx = 0; bx < bwidth; ++bx) { for (uint32_t bx = 0; bx < bwidth; ++bx) {
const uint32_t baseX = bx * 8; const uint32_t baseX = bx * T::BlockWidth;
for (uint32_t y = 0; y < std::min(h, 8u); ++y) { for (uint32_t y = 0; y < std::min(h - baseY, T::BlockHeight); ++y) {
uint8_t* target = targetMip + (baseY + y) * w + baseX; auto* target = targetMip + (baseY + y) * w + baseX;
for (uint32_t x = 0; x < std::min(w, 8u); ++x) { const auto n = std::min(w - baseX, T::BlockWidth);
target[x] = ExpandTo8<4>(in[x / 2] >> ((x & 1) ? 0 : 4) & 0xf); for (uint32_t x = 0; x < n; ++x) {
T::decode_texel(target, in, x);
} }
in += std::min<size_t>(w / 4, 4); in += T::BlockWidth / T::Frac;
} }
} }
} }
@ -112,102 +125,67 @@ static ByteBuffer BuildI4FromGCN(uint32_t width, uint32_t height, uint32_t mips,
return buf; return buf;
} }
static ByteBuffer BuildI8FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { template <TextureDecoder T>
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); static ByteBuffer DecodeLinear(uint32_t width, ArrayRef<uint8_t> data) {
ByteBuffer buf{texelCount}; ByteBuffer buf{width * sizeof(T::Target)};
auto* target = reinterpret_cast<typename T::Target*>(buf.data());
uint32_t w = width; const auto* in = reinterpret_cast<const typename T::Source*>(data.data());
uint32_t h = height; for (uint32_t x = 0; x < width; ++x) {
auto* targetMip = buf.data(); T::decode_texel(target, in, x);
const uint8_t* in = data.data();
for (uint32_t mip = 0; mip < mips; ++mip) {
const uint32_t bwidth = (w + 7) / 8;
const uint32_t bheight = (h + 3) / 4;
for (uint32_t by = 0; by < bheight; ++by) {
const uint32_t baseY = by * 4;
for (uint32_t bx = 0; bx < bwidth; ++bx) {
const uint32_t baseX = bx * 8;
for (uint32_t y = 0; y < 4; ++y) {
uint8_t* target = targetMip + (baseY + y) * w + baseX;
const auto n = std::min(w, 8u);
for (size_t x = 0; x < n; ++x) {
target[x] = in[x];
} }
in += n;
}
}
}
targetMip += w * h;
if (w > 1) {
w /= 2;
}
if (h > 1) {
h /= 2;
}
}
return buf; return buf;
} }
ByteBuffer BuildIA4FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { struct TextureDecoderI4 {
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); using Source = uint8_t;
ByteBuffer buf{sizeof(RGBA8) * texelCount}; using Target = uint8_t;
uint32_t w = width; static constexpr uint32_t Frac = 2;
uint32_t h = height; static constexpr uint32_t BlockWidth = 8;
RGBA8* targetMip = reinterpret_cast<RGBA8*>(buf.data()); static constexpr uint32_t BlockHeight = 8;
const uint8_t* in = data.data();
for (uint32_t mip = 0; mip < mips; ++mip) { static void decode_texel(Target* target, const Source* in, const uint32_t x) {
const uint32_t bwidth = (w + 7) / 8; target[x] = ExpandTo8<4>(in[x / 2] >> (x & 1 ? 0 : 4) & 0xf);
const uint32_t bheight = (h + 3) / 4; }
for (uint32_t by = 0; by < bheight; ++by) { };
const uint32_t baseY = by * 4;
for (uint32_t bx = 0; bx < bwidth; ++bx) { struct TextureDecoderI8 {
const uint32_t baseX = bx * 8; using Source = uint8_t;
for (uint32_t y = 0; y < 4; ++y) { using Target = uint8_t;
RGBA8* target = targetMip + (baseY + y) * w + baseX;
const auto n = std::min(w, 8u); static constexpr uint32_t Frac = 1;
for (size_t x = 0; x < n; ++x) { static constexpr uint32_t BlockWidth = 8;
static constexpr uint32_t BlockHeight = 4;
static void decode_texel(Target* target, const Source* in, const uint32_t x) { target[x] = in[x]; }
};
struct TextureDecoderIA4 {
using Source = uint8_t;
using Target = RGBA8;
static constexpr uint32_t Frac = 1;
static constexpr uint32_t BlockWidth = 8;
static constexpr uint32_t BlockHeight = 4;
static void decode_texel(Target* target, const Source* in, const uint32_t x) {
const uint8_t intensity = ExpandTo8<4>(in[x] & 0xf); const uint8_t intensity = ExpandTo8<4>(in[x] & 0xf);
target[x].r = intensity; target[x].r = intensity;
target[x].g = intensity; target[x].g = intensity;
target[x].b = intensity; target[x].b = intensity;
target[x].a = ExpandTo8<4>(in[x] >> 4); target[x].a = ExpandTo8<4>(in[x] >> 4);
} }
in += n; };
}
}
}
targetMip += w * h;
if (w > 1) {
w /= 2;
}
if (h > 1) {
h /= 2;
}
}
return buf; struct TextureDecoderIA8 {
} using Source = uint8_t;
using Target = RGBA8;
ByteBuffer BuildIA8FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { static constexpr uint32_t Frac = 1;
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); static constexpr uint32_t BlockWidth = 8;
ByteBuffer buf{sizeof(RGBA8) * texelCount}; static constexpr uint32_t BlockHeight = 4;
uint32_t w = width; static void decode_texel(Target* target, const Source* in, const uint32_t x) {
uint32_t h = height;
auto* targetMip = reinterpret_cast<RGBA8*>(buf.data());
const auto* in = reinterpret_cast<const uint16_t*>(data.data());
for (uint32_t mip = 0; mip < mips; ++mip) {
const uint32_t bwidth = (w + 3) / 4;
const uint32_t bheight = (h + 3) / 4;
for (uint32_t by = 0; by < bheight; ++by) {
const uint32_t baseY = by * 4;
for (uint32_t bx = 0; bx < bwidth; ++bx) {
const uint32_t baseX = bx * 4;
for (uint32_t y = 0; y < 4; ++y) {
RGBA8* target = targetMip + (baseY + y) * w + baseX;
for (size_t x = 0; x < 4; ++x) {
const auto texel = bswap16(in[x]); const auto texel = bswap16(in[x]);
const uint8_t intensity = texel >> 8; const uint8_t intensity = texel >> 8;
target[x].r = intensity; target[x].r = intensity;
@ -215,154 +193,58 @@ ByteBuffer BuildIA8FromGCN(uint32_t width, uint32_t height, uint32_t mips, Array
target[x].b = intensity; target[x].b = intensity;
target[x].a = texel & 0xff; target[x].a = texel & 0xff;
} }
in += 4; };
}
}
}
targetMip += w * h;
if (w > 1) {
w /= 2;
}
if (h > 1) {
h /= 2;
}
}
return buf; struct TextureDecoderC4 {
} using Source = uint8_t;
using Target = uint16_t;
ByteBuffer BuildC4FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { static constexpr uint32_t Frac = 2;
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); static constexpr uint32_t BlockWidth = 8;
ByteBuffer buf{texelCount * 2}; static constexpr uint32_t BlockHeight = 8;
uint32_t w = width; static void decode_texel(Target* target, const Source* in, const uint32_t x) {
uint32_t h = height; target[x] = in[x / 2] >> (x & 1 ? 0 : 4) & 0xf;
uint16_t* targetMip = reinterpret_cast<uint16_t*>(buf.data());
const uint8_t* in = data.data();
for (uint32_t mip = 0; mip < mips; ++mip) {
const uint32_t bwidth = (w + 7) / 8;
const uint32_t bheight = (h + 7) / 8;
for (uint32_t by = 0; by < bheight; ++by) {
const uint32_t baseY = by * 8;
for (uint32_t bx = 0; bx < bwidth; ++bx) {
const uint32_t baseX = bx * 8;
for (uint32_t y = 0; y < std::min(8u, h); ++y) {
uint16_t* target = targetMip + (baseY + y) * w + baseX;
const auto n = std::min(w, 8u);
for (size_t x = 0; x < n; ++x) {
target[x] = in[x / 2] >> ((x & 1) ? 0 : 4) & 0xf;
}
in += n / 2;
}
}
}
targetMip += w * h;
if (w > 1) {
w /= 2;
}
if (h > 1) {
h /= 2;
}
} }
};
return buf; struct TextureDecoderC8 {
} using Source = uint8_t;
using Target = uint16_t;
ByteBuffer BuildC8FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { static constexpr uint32_t Frac = 1;
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); static constexpr uint32_t BlockWidth = 8;
ByteBuffer buf{texelCount * 2}; static constexpr uint32_t BlockHeight = 4;
uint32_t w = width; static void decode_texel(Target* target, const Source* in, const uint32_t x) { target[x] = in[x]; }
uint32_t h = height; };
uint16_t* targetMip = reinterpret_cast<uint16_t*>(buf.data());
const uint8_t* in = data.data();
for (uint32_t mip = 0; mip < mips; ++mip) {
const uint32_t bwidth = (w + 7) / 8;
const uint32_t bheight = (h + 3) / 4;
for (uint32_t by = 0; by < bheight; ++by) {
const uint32_t baseY = by * 4;
for (uint32_t bx = 0; bx < bwidth; ++bx) {
const uint32_t baseX = bx * 8;
for (uint32_t y = 0; y < 4; ++y) {
uint16_t* target = targetMip + (baseY + y) * w + baseX;
const auto n = std::min(w, 8u);
for (size_t x = 0; x < n; ++x) {
target[x] = in[x];
}
in += n;
}
}
}
targetMip += w * h;
if (w > 1) {
w /= 2;
}
if (h > 1) {
h /= 2;
}
}
return buf; struct TextureDecoderRGB565 {
} using Source = uint16_t;
using Target = RGBA8;
ByteBuffer BuildRGB565FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { static constexpr uint32_t Frac = 1;
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); static constexpr uint32_t BlockWidth = 4;
ByteBuffer buf{sizeof(RGBA8) * texelCount}; static constexpr uint32_t BlockHeight = 4;
uint32_t w = width; static void decode_texel(Target* target, const Source* in, const uint32_t x) {
uint32_t h = height;
auto* targetMip = reinterpret_cast<RGBA8*>(buf.data());
const auto* in = reinterpret_cast<const uint16_t*>(data.data());
for (uint32_t mip = 0; mip < mips; ++mip) {
const uint32_t bwidth = (w + 3) / 4;
const uint32_t bheight = (h + 3) / 4;
for (uint32_t by = 0; by < bheight; ++by) {
const uint32_t baseY = by * 4;
for (uint32_t bx = 0; bx < bwidth; ++bx) {
const uint32_t baseX = bx * 4;
for (uint32_t y = 0; y < std::min(4u, h); ++y) {
RGBA8* target = targetMip + (baseY + y) * w + baseX;
for (size_t x = 0; x < std::min(4u, w); ++x) {
const auto texel = bswap16(in[x]); const auto texel = bswap16(in[x]);
target[x].r = ExpandTo8<5>(texel >> 11 & 0x1f); target[x].r = ExpandTo8<5>(texel >> 11 & 0x1f);
target[x].g = ExpandTo8<6>(texel >> 5 & 0x3f); target[x].g = ExpandTo8<6>(texel >> 5 & 0x3f);
target[x].b = ExpandTo8<5>(texel & 0x1f); target[x].b = ExpandTo8<5>(texel & 0x1f);
target[x].a = 0xff; target[x].a = 0xff;
} }
in += 4; };
}
}
}
targetMip += w * h;
if (w > 1) {
w /= 2;
}
if (h > 1) {
h /= 2;
}
}
return buf; struct TextureDecoderRGB5A3 {
} using Source = uint16_t;
using Target = RGBA8;
ByteBuffer BuildRGB5A3FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { static constexpr uint32_t Frac = 1;
size_t texelCount = ComputeMippedTexelCount(width, height, mips); static constexpr uint32_t BlockWidth = 4;
ByteBuffer buf{sizeof(RGBA8) * texelCount}; static constexpr uint32_t BlockHeight = 4;
uint32_t w = width; static void decode_texel(Target* target, const Source* in, const uint32_t x) {
uint32_t h = height;
auto* targetMip = reinterpret_cast<RGBA8*>(buf.data());
const auto* in = reinterpret_cast<const uint16_t*>(data.data());
for (uint32_t mip = 0; mip < mips; ++mip) {
const uint32_t bwidth = (w + 3) / 4;
const uint32_t bheight = (h + 3) / 4;
for (uint32_t by = 0; by < bheight; ++by) {
const uint32_t baseY = by * 4;
for (uint32_t bx = 0; bx < bwidth; ++bx) {
const uint32_t baseX = bx * 4;
for (uint32_t y = 0; y < std::min(4u, h); ++y) {
RGBA8* target = targetMip + (baseY + y) * w + baseX;
for (size_t x = 0; x < std::min(4u, w); ++x) {
const auto texel = bswap16(in[x]); const auto texel = bswap16(in[x]);
if ((texel & 0x8000) != 0) { if ((texel & 0x8000) != 0) {
target[x].r = ExpandTo8<5>(texel >> 10 & 0x1f); target[x].r = ExpandTo8<5>(texel >> 10 & 0x1f);
@ -376,23 +258,9 @@ ByteBuffer BuildRGB5A3FromGCN(uint32_t width, uint32_t height, uint32_t mips, Ar
target[x].a = ExpandTo8<3>(texel >> 12 & 0x7); target[x].a = ExpandTo8<3>(texel >> 12 & 0x7);
} }
} }
in += 4; };
}
}
}
targetMip += w * h;
if (w > 1) {
w /= 2;
}
if (h > 1) {
h /= 2;
}
}
return buf; static ByteBuffer BuildRGBA8FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) {
}
ByteBuffer BuildRGBA8FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) {
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); const size_t texelCount = ComputeMippedTexelCount(width, height, mips);
ByteBuffer buf{sizeof(RGBA8) * texelCount}; ByteBuffer buf{sizeof(RGBA8) * texelCount};
@ -436,7 +304,7 @@ ByteBuffer BuildRGBA8FromGCN(uint32_t width, uint32_t height, uint32_t mips, Arr
return buf; return buf;
} }
ByteBuffer BuildDXT1FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { static ByteBuffer BuildDXT1FromGCN(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) {
const size_t blockCount = ComputeMippedBlockCountDXT1(width, height, mips); const size_t blockCount = ComputeMippedBlockCountDXT1(width, height, mips);
ByteBuffer buf{sizeof(DXT1Block) * blockCount}; ByteBuffer buf{sizeof(DXT1Block) * blockCount};
@ -483,9 +351,8 @@ ByteBuffer BuildDXT1FromGCN(uint32_t width, uint32_t height, uint32_t mips, Arra
return buf; return buf;
} }
ByteBuffer BuildRGBA8FromCMPR(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) { static ByteBuffer BuildRGBA8FromCMPR(uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data) {
const size_t texelCount = ComputeMippedTexelCount(width, height, mips); const size_t texelCount = ComputeMippedTexelCount(width, height, mips);
const size_t blockCount = ComputeMippedBlockCountDXT1(width, height, mips);
ByteBuffer buf{sizeof(RGBA8) * texelCount}; ByteBuffer buf{sizeof(RGBA8) * texelCount};
uint32_t h = height; uint32_t h = height;
@ -574,31 +441,43 @@ ByteBuffer convert_texture(u32 format, uint32_t width, uint32_t height, uint32_t
case GX_TF_RGBA8_PC: case GX_TF_RGBA8_PC:
return {}; // No conversion return {}; // No conversion
case GX_TF_I4: case GX_TF_I4:
return BuildI4FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderI4>(width, height, mips, data);
case GX_TF_I8: case GX_TF_I8:
return BuildI8FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderI8>(width, height, mips, data);
case GX_TF_IA4: case GX_TF_IA4:
return BuildIA4FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderIA4>(width, height, mips, data);
case GX_TF_IA8: case GX_TF_IA8:
return BuildIA8FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderIA8>(width, height, mips, data);
case GX_TF_C4: case GX_TF_C4:
return BuildC4FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderC4>(width, height, mips, data);
case GX_TF_C8: case GX_TF_C8:
return BuildC8FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderC8>(width, height, mips, data);
case GX_TF_C14X2: case GX_TF_C14X2:
FATAL("convert_texture: C14X2 unimplemented"); FATAL("convert_texture: C14X2 unimplemented");
case GX_TF_RGB565: case GX_TF_RGB565:
return BuildRGB565FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderRGB565>(width, height, mips, data);
case GX_TF_RGB5A3: case GX_TF_RGB5A3:
return BuildRGB5A3FromGCN(width, height, mips, data); return DecodeTiled<TextureDecoderRGB5A3>(width, height, mips, data);
case GX_TF_RGBA8: case GX_TF_RGBA8:
return BuildRGBA8FromGCN(width, height, mips, data); return BuildRGBA8FromGCN(width, height, mips, data);
case GX_TF_CMPR: case GX_TF_CMPR: {
if (webgpu::g_device.HasFeature(wgpu::FeatureName::TextureCompressionBC)) { if (webgpu::g_device.HasFeature(wgpu::FeatureName::TextureCompressionBC)) {
return BuildDXT1FromGCN(width, height, mips, data); return BuildDXT1FromGCN(width, height, mips, data);
} else { }
return BuildRGBA8FromCMPR(width, height, mips, data); return BuildRGBA8FromCMPR(width, height, mips, data);
} }
} }
} }
ByteBuffer convert_tlut(u32 format, uint32_t width, ArrayRef<uint8_t> data) {
switch (format) {
DEFAULT_FATAL("convert_tlut: unsupported tlut format {}", format);
case GX_TF_IA8: // GX_TL_IA8
return DecodeLinear<TextureDecoderIA8>(width, data);
case GX_TF_RGB565: // GX_TL_RGB565
return DecodeLinear<TextureDecoderRGB565>(width, data);
case GX_TF_RGB5A3: // GX_TL_RGB5A3
return DecodeLinear<TextureDecoderRGB5A3>(width, data);
}
}
} // namespace aurora::gfx } // namespace aurora::gfx

1
lib/gfx/texture_convert.hpp
View File

@ -26,4 +26,5 @@ static wgpu::TextureFormat to_wgpu(u32 format) {
} }
ByteBuffer convert_texture(u32 format, uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data); ByteBuffer convert_texture(u32 format, uint32_t width, uint32_t height, uint32_t mips, ArrayRef<uint8_t> data);
ByteBuffer convert_tlut(u32 format, uint32_t width, ArrayRef<uint8_t> data);
} // namespace aurora::gfx } // namespace aurora::gfx