INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-07 21:38:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: doing wrong alignment on dynamic filling

Browse Source
This commit is contained in:
Jan 2025-06-04 18:08:23 +01:00
parent af4abe49d3
commit 3338b007b4
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
4 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
View File

@ -901,8 +901,10 @@ namespace
{
if (info && !info->m_has_matching_cross_platform_structure && StructureComputations(info).GetDynamicMember())
{
LINE("// Alloc first for alignment, then proceed to read as game does")
LINEF("m_stream.Alloc({0});", def->GetAlignment())
LINEF("const auto allocSize = LoadDynamicFill_{0}(m_stream.LoadWithFill(0));", MakeSafeTypeName(def))
LINEF("*{0} = static_cast<{1}*>(m_stream.AllocOutOfBlock({2}, allocSize));", MakeTypePtrVarName(def), def->GetFullName(), def->GetAlignment())
LINEF("*{0} = static_cast<{1}*>(m_stream.AllocOutOfBlock(0, allocSize));", MakeTypePtrVarName(def), def->GetFullName())
}
else
{
@ -1462,19 +1464,23 @@ namespace
if (preAllocDynamic)
{
LINEF("const auto allocSize = LoadDynamicFill_{0}(m_stream.LoadWithFill(0));", MakeSafeTypeName(member->m_type->m_definition))
LINE_STARTF("{0} = static_cast<{1}{2}*>(m_stream.AllocOutOfBlock(", MakeMemberAccess(info, member, modifier), typeDecl, followingReferences)
LINE("// Alloc first for alignment, then proceed to read as game does")
if (member->m_alloc_alignment)
{
LINE_MIDDLE(MakeEvaluation(member->m_alloc_alignment.get()))
LINEF("m_stream.Alloc({0});", MakeEvaluation(member->m_alloc_alignment.get()))
}
else
{
LINE_MIDDLEF("{0}", modifier.GetAlignment())
LINEF("m_stream.Alloc({0});", modifier.GetAlignment())
}
LINE_ENDF(", allocSize));", member->m_type->m_definition->GetFullName())
LINEF("const auto allocSize = LoadDynamicFill_{0}(m_stream.LoadWithFill(0));", MakeSafeTypeName(member->m_type->m_definition))
// We do not align again, because we already did previously
LINEF("{0} = static_cast<{1}{2}*>(m_stream.AllocOutOfBlock(0, allocSize));",
MakeMemberAccess(info, member, modifier),
typeDecl,
followingReferences)
}
else
{

4
src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp
View File

@ -164,6 +164,10 @@ void ContentLoader::LoadXAssetArray(const bool atStreamStart, const size_t count
{
LoadXAsset(false);
varXAsset++;
#ifdef DEBUG_OFFSETS
m_stream.DebugOffsets(index);
#endif
}
}

21
src/ZoneLoading/Zone/Stream/ZoneInputStream.cpp
View File

@ -9,6 +9,8 @@
#include <cassert>
#include <cstring>
#include <iostream>
#include <sstream>
#include <stack>
ZoneStreamFillReadAccessor::ZoneStreamFillReadAccessor(
@ -433,6 +435,25 @@ namespace
return *m_pointer_redirect_lookup[redirectIndex];
}
#ifdef DEBUG_OFFSETS
void DebugOffsets(const size_t assetIndex) const override
{
std::ostringstream ss;
ss << "Asset " << assetIndex;
for (const auto& block : m_blocks)
{
if (block->m_type != XBlockType::BLOCK_TYPE_NORMAL)
continue;
ss << " " << m_block_offsets[block->m_index];
}
ss << "\n";
std::cout << ss.str();
}
#endif
private:
void LoadDataFromBlock(const XBlock& block, void* dst, const size_t size)
{

6
src/ZoneLoading/Zone/Stream/ZoneInputStream.h
View File

@ -11,6 +11,8 @@
#include <type_traits>
#include <vector>
#define DEBUG_OFFSETS 1
class ZoneStreamFillReadAccessor
{
public:
@ -170,6 +172,10 @@ public:
return static_cast<T*>(ConvertOffsetToAliasLookup(static_cast<const void*>(offset)));
}
#ifdef DEBUG_OFFSETS
virtual void DebugOffsets(size_t assetIndex) const = 0;
#endif
static std::unique_ptr<ZoneInputStream> Create(
unsigned pointerBitCount, unsigned blockBitCount, std::vector<XBlock*>& blocks, block_t insertBlock, ILoadingStream& stream, MemoryManager& memory);
};