encounter/aurora
0
0
Fork 0
mirror of https://github.com/encounter/aurora.git synced 2026-07-09 18:19:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Better fix for zeroed texture dimensions

Browse Source
This commit is contained in:
Luke Street
2026-04-21 17:39:40 -06:00
parent b524038d75
commit 26da4c6bb0
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gfx/texture.hpp
+3 -6
View File
@@ -59,7 +59,7 @@ void write_texture(TextureRef& ref, ArrayRef<uint8_t> data) noexcept;
struct GXTexObj_ {
u32 mode0 = 0;
u32 mode1 = 0;
u32 image0 = 0;
u32 image0 = UINT32_MAX;
u32 image3 = 0;
const void* userData = nullptr;
const void* data = nullptr;
@@ -73,11 +73,8 @@ struct GXTexObj_ {
static constexpr u32 get_bits(u32 reg, u32 size, u32 shift) noexcept { return (reg >> shift) & ((1u << size) - 1); }
// Don't fall back to raw_width/raw_height: when the object is zeroed, they will return 1 instead of 0
u32 width() const noexcept { return mWidth; }
u32 raw_width() const noexcept { return get_bits(image0, 10, 0) + 1; }
u32 height() const noexcept { return mHeight; }
u32 raw_height() const noexcept { return get_bits(image0, 10, 10) + 1; }
u32 width() const noexcept { return mWidth != 0 ? mWidth : get_bits(image0, 10, 0) + 1 & 0x3FF; }
u32 height() const noexcept { return mHeight != 0 ? mHeight : get_bits(image0, 10, 10) + 1 & 0x3FF; }
u32 raw_format() const noexcept { return get_bits(image0, 4, 20); }
u32 format() const noexcept { return mFormat != aurora::gfx::InvalidTextureFormat ? mFormat : raw_format(); }
GXTexWrapMode wrap_s() const noexcept { return static_cast<GXTexWrapMode>(get_bits(mode0, 2, 0)); }
tests/gx_fifo_test.cpp
+20
View File
@@ -1304,6 +1304,26 @@ TEST_F(GXFifoTest, LoadTexObjPcFormat_PreservesFullFormatMetadata) {
EXPECT_EQ(slot.raw_format(), static_cast<u32>(GX_TF_RGBA8));
}
TEST_F(GXFifoTest, TexObjRawDimensions_WrapAtTenBitBoundary) {
auto& slot = gxState().loadedTextures[GX_TEXMAP0];
slot.image0 = (0x3FFu << 0) | (0x3FFu << 10);
slot.mWidth = 0;
slot.mHeight = 0;
EXPECT_EQ(slot.width(), 0u);
EXPECT_EQ(slot.height(), 0u);
}
TEST_F(GXFifoTest, TexObjExplicitDimensions_DoNotWrapAtTenBitBoundary) {
auto& slot = gxState().loadedTextures[GX_TEXMAP0];
slot.image0 = (0x3FFu << 0) | (0x3FFu << 10);
slot.mWidth = 1024;
slot.mHeight = 1024;
EXPECT_EQ(slot.width(), 1024u);
EXPECT_EQ(slot.height(), 1024u);
}
TEST_F(GXFifoTest, LoadTexObjCiAndTlut_PopulatesTextureAndTlutSlots) {
alignas(32) u8 image[64]{};
alignas(32) u16 palette[16]{};