mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-03 11:42:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removec uneccessary 64-byte align for RwMatrix.

Browse Source
This commit is contained in:
Falco Girgis
2025-03-15 13:20:58 -05:00
parent e0b6ac6ab7
commit 446d899c31
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/librw/src/dc/rwdc.cpp vendored
View File

@@ -5779,7 +5779,9 @@ writeNativeSkin(Stream *stream, int32 len, void *object, int32 offset)
stream->write8(&skin->numBones, 4); stream->write8(&skin->numBones, 4);
for(int32 i = 0; i < skin->numBones; i++){ for(int32 i = 0; i < skin->numBones; i++){
Matrix &m = *reinterpret_cast<Matrix *>(&skin->inverseMatrices[i * 16]); Matrix &m = *reinterpret_cast<Matrix *>(
&skin->inverseMatrices[i * 16]);
if(m.flags & MatrixBase::IDENTITY_OLD) if(m.flags & MatrixBase::IDENTITY_OLD)
m.flags |= MatrixBase::IDENTITY; m.flags |= MatrixBase::IDENTITY;
m.pad0 = 0; m.pad0 = 0;
@@ -5787,6 +5789,7 @@ writeNativeSkin(Stream *stream, int32 len, void *object, int32 offset)
m.atw = 0.0f; m.atw = 0.0f;
m.posw = 1.0f; m.posw = 1.0f;
} }
stream->write32(skin->inverseMatrices, skin->numBones*64); stream->write32(skin->inverseMatrices, skin->numBones*64);
return stream; return stream;
} }

5
vendor/librw/src/engine.cpp vendored
View File

@@ -56,7 +56,6 @@ size_t totalMemoryAllocated;
// We align managed memory blocks on a 16 byte boundary // We align managed memory blocks on a 16 byte boundary
#define ALIGN16(x) ((x) + 0xF & ~0xF) #define ALIGN16(x) ((x) + 0xF & ~0xF)
#define ALIGN64(x) ((x) + 0x3F & ~0x3F)
void* void*
malloc_managed(size_t sz, uint32 hint) malloc_managed(size_t sz, uint32 hint)
{ {
@@ -66,13 +65,13 @@ malloc_managed(size_t sz, uint32 hint)
if(sz == 0) return nil; if(sz == 0) return nil;
bool align64 = !!(hint & ID_MATRIX); bool align64 = !!(hint & ID_MATRIX);
origPtr = malloc(sz + sizeof(MemoryBlock) + ((align64)? 63 : 15)); origPtr = malloc(sz + sizeof(MemoryBlock) + 15);
if(origPtr == nil) if(origPtr == nil)
return nil; return nil;
totalMemoryAllocated += sz; totalMemoryAllocated += sz;
data = (uint8*)origPtr; data = (uint8*)origPtr;
data += sizeof(MemoryBlock); data += sizeof(MemoryBlock);
data = (uint8*) ((align64)? ALIGN64((uintptr)data) : ALIGN16((uintptr)data)); data = (uint8*) ALIGN16((uintptr)data);
mem = (MemoryBlock*)(data-sizeof(MemoryBlock)); mem = (MemoryBlock*)(data-sizeof(MemoryBlock));
mem->sz = sz; mem->sz = sz;

9
vendor/librw/src/skin.cpp vendored
View File

@@ -225,15 +225,6 @@ writeSkin(Stream *stream, int32 len, void *object, int32 offset, int32)
if(oldFormat) if(oldFormat)
stream->writeU32(0xdeaddead); stream->writeU32(0xdeaddead);
printf("ROFLCOPTER!\n"); fflush(stdout);
Matrix &m = *reinterpret_cast<Matrix *>(&skin->inverseMatrices[i * 16]);
if(m.flags & MatrixBase::IDENTITY_OLD)
m.flags |= MatrixBase::IDENTITY;
m.pad0 = 0;
m.upw = 0.0f;
m.atw = 0.0f;
m.posw = 1.0f;
stream->write32(&skin->inverseMatrices[i*16], 64); stream->write32(&skin->inverseMatrices[i*16], 64);
} }