RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(gx): correct mip pointer handling in MippedImgAllocA

Browse Source
This commit is contained in:
fallenoak 2025-12-13 11:51:17 -06:00
parent e47edce5a3
commit 0063f7fd12
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gx/Texture.cpp
View File

@ -11,6 +11,11 @@
#include <storm/Memory.hpp> #include <storm/Memory.hpp>
#include <storm/String.hpp> #include <storm/String.hpp>
#define ALIGN_PTR(ptr, align) \
((void*)(((uintptr_t)(ptr) + ((uintptr_t)(align) - 1)) & ~((uintptr_t)(align) - 1)))
#define MIPPED_IMG_ALIGN 16
namespace Texture { namespace Texture {
int32_t s_createBlpAsync; // Invented name int32_t s_createBlpAsync; // Invented name
MipBits* s_mipBits; MipBits* s_mipBits;
@ -505,19 +510,25 @@ MipBits* MippedImgAllocA(uint32_t fourCC, uint32_t width, uint32_t height, const
uint32_t levelCount = CalcLevelCount(width, height); uint32_t levelCount = CalcLevelCount(width, height);
uint32_t levelDataSize = CalcLevelOffset(levelCount, width, height, fourCC); uint32_t levelDataSize = CalcLevelOffset(levelCount, width, height, fourCC);
MipBits* images = reinterpret_cast<MipBits*>(SMemAlloc(levelDataSize + sizeof(void*) * levelCount + 16, fileName, lineNumber, 0)); // Size must account for pointer array (MipBits::mip[]) + mip data + alignment
size_t imageSize = (sizeof(MipBits::mip) * levelCount) + levelDataSize + MIPPED_IMG_ALIGN;
auto imageData = static_cast<char*>(SMemAlloc(imageSize, fileName, lineNumber, 0x0));
uintptr_t v10 = (reinterpret_cast<uintptr_t>(images) + sizeof(void*) * levelCount + 15) & static_cast<uintptr_t>(-sizeof(void*)); // Image (MipBits) is a dynamically sized array of mip pointers (MipBits::mip[])
uintptr_t offset = v10 - reinterpret_cast<uintptr_t>(images); auto image = reinterpret_cast<MipBits*>(imageData);
MipBits** ptr = reinterpret_cast<MipBits**>(images); // Mip data starts after mip pointers
auto mipBase = imageData + (sizeof(MipBits::mip) * levelCount);
auto alignedMipBase = static_cast<char*>(ALIGN_PTR(mipBase, MIPPED_IMG_ALIGN));
// Populate mip pointers for each mip level
uint32_t levelOffset = 0;
for (int32_t level = 0; level < levelCount; level++) { for (int32_t level = 0; level < levelCount; level++) {
ptr[level] = images + offset; image->mip[level] = reinterpret_cast<C4Pixel*>(alignedMipBase + levelOffset);
offset += CalcLevelSize(level, width, height, fourCC); levelOffset += CalcLevelSize(level, width, height, fourCC);
} }
return images; return image;
} }
uint32_t MippedImgCalcSize(uint32_t fourCC, uint32_t width, uint32_t height) { uint32_t MippedImgCalcSize(uint32_t fourCC, uint32_t width, uint32_t height) {