zone/OpenAssetTools
2
0 Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-11-07 01:01:59 +00:00
Code Activity

fix: properly calculate matching memory layout with multiple variants

Browse Source
This commit is contained in:
Jan Laupetin committed 2026-10-31 07:50:47 +01:00
1 parent d4ab54541d
commit c9717f8b7b
8 files changed
+49 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
+18 -19
View File
@@ -142,8 +142,8 @@ namespace
// Variable Declarations: type varType;
for (const auto* type : m_env.m_used_types)
{
if (type->m_info && !type->m_info->m_definition->IsAnonymous()
&& (!type->m_info->m_is_leaf || !type->m_info->m_has_matching_cross_platform_structure) && !StructureComputations(type->m_info).IsAsset())
if (type->m_info && !type->m_info->m_definition->IsAnonymous() && (!type->m_info->m_is_leaf || !MemoryLayoutMatches(*type->m_info))
&& !StructureComputations(type->m_info).IsAsset())
{
LINE(VariableDecl(type->m_type))
}
@@ -349,8 +349,8 @@ namespace
for (const auto* type : m_env.m_used_types)
{
if (type->m_info && !type->m_info->m_definition->IsAnonymous()
&& (!type->m_info->m_is_leaf || !type->m_info->m_has_matching_cross_platform_structure) && !StructureComputations(type->m_info).IsAsset())
if (type->m_info && !type->m_info->m_definition->IsAnonymous() && (!type->m_info->m_is_leaf || !MemoryLayoutMatches(*type->m_info))
&& !StructureComputations(type->m_info).IsAsset())
{
PrintVariableInitialization(type->m_type);
}
@@ -378,7 +378,7 @@ namespace
LINE("{")
m_intendation++;
const auto callFillForMember = memberInfo.m_type && !memberInfo.m_type->m_has_matching_cross_platform_structure;
const auto callFillForMember = memberInfo.m_type && !MemoryLayoutMatches(*memberInfo.m_type);
if (callFillForMember)
{
@@ -458,7 +458,7 @@ namespace
const DeclarationModifierComputations& modifier,
const size_t nestedBaseOffset)
{
if (memberInfo.m_type && !memberInfo.m_type->m_has_matching_cross_platform_structure)
if (memberInfo.m_type && !MemoryLayoutMatches(*memberInfo.m_type))
{
LINEF("for (auto i = 0u; i < std::extent_v<decltype({0}::{1})>; i++)", structInfo.m_definition->m_name, memberInfo.m_member->m_name)
LINE("{")
@@ -488,7 +488,7 @@ namespace
if (!hasAnonymousType)
{
const auto hasMismatchingStructure = memberInfo.m_type && !memberInfo.m_type->m_has_matching_cross_platform_structure;
const auto hasMismatchingStructure = memberInfo.m_type && !MemoryLayoutMatches(*memberInfo.m_type);
const auto hasDynamicMember = memberInfo.m_type && StructureComputations(memberInfo.m_type).GetDynamicMember();
if (hasMismatchingStructure || hasDynamicMember)
{
@@ -893,7 +893,7 @@ namespace
void PrintLoadPtrArrayMethod_Loading(const DataDefinition* def, const StructureInformation* info) const
{
const auto alignment = info && def == info->m_definition ? MakeAllocAlignment(*info) : std::to_string(def->GetAlignment(m_env.m_word_size));
if (info && !info->m_has_matching_cross_platform_structure && StructureComputations(info).GetDynamicMember())
if (info && !MemoryLayoutMatches(*info) && StructureComputations(info).GetDynamicMember())
{
assert(def == info->m_definition);
LINE("// Alloc first for alignment, then proceed to read as game does")
@@ -949,7 +949,7 @@ namespace
LINE("{")
m_intendation++;
if (info && !info->m_has_matching_cross_platform_structure)
if (info && !MemoryLayoutMatches(*info))
{
LINEF("*{0} = m_stream.ConvertOffsetToPointerLookup(*{0}).Expect();", MakeTypePtrVarName(def))
}
@@ -1036,7 +1036,7 @@ namespace
LINE("")
LINE("if (atStreamStart)")
if (info->m_has_matching_cross_platform_structure)
if (MemoryLayoutMatches(*info))
{
m_intendation++;
LINEF("m_stream.Load<{0}>({1}, count);", info->m_definition->GetFullName(), MakeTypeVarName(def))
@@ -1163,7 +1163,7 @@ namespace
LINE(MakeCustomActionCall(member->m_post_load_action.get()))
}
}
else if (member->m_type && !member->m_type->m_has_matching_cross_platform_structure)
else if (member->m_type && !MemoryLayoutMatches(*member->m_type))
{
LINEF("const auto fillArraySize = static_cast<size_t>({0});", MakeEvaluation(modifier.GetArrayPointerCountEvaluation()))
LINEF("const auto fill = m_stream.LoadWithFill({0} * fillArraySize);", member->m_member->m_type_declaration->m_type->GetSize(m_env.m_word_size))
@@ -1257,7 +1257,7 @@ namespace
m_env.m_word_size_mismatch ? "false" : "true",
MakeEvaluation(modifier.GetDynamicArraySizeEvaluation()))
}
else if (info->m_has_matching_cross_platform_structure)
else if (MemoryLayoutMatches(*info))
{
if (m_env.m_word_size_mismatch)
{
@@ -1336,7 +1336,7 @@ namespace
LINE(MakeCustomActionCall(member->m_post_load_action.get()))
}
}
else if (member->m_type && !member->m_type->m_has_matching_cross_platform_structure)
else if (member->m_type && !MemoryLayoutMatches(*member->m_type))
{
LINEF("{0} = {1};", MakeTypeVarName(member->m_member->m_type_declaration->m_type), MakeMemberAccess(info, member, modifier))
LINEF("FillStruct_{0}(m_stream.LoadWithFill({1}));",
@@ -1427,8 +1427,7 @@ namespace
[[nodiscard]] bool ShouldAllocOutOfBlock(const MemberInformation& member, const MemberLoadType loadType) const
{
return m_env.m_word_size_mismatch
&& ((member.m_type && !member.m_type->m_has_matching_cross_platform_structure) || loadType == MemberLoadType::POINTER_ARRAY);
return m_env.m_word_size_mismatch && ((member.m_type && !MemoryLayoutMatches(*member.m_type)) || loadType == MemberLoadType::POINTER_ARRAY);
}
[[nodiscard]] bool
@@ -1589,7 +1588,7 @@ namespace
LINE("{")
m_intendation++;
if (info->m_has_matching_cross_platform_structure)
if (MemoryLayoutMatches(*info))
{
LINEF("{0} = m_stream.ConvertOffsetToAliasNative({0});", MakeMemberAccess(info, member, modifier))
}
@@ -1871,7 +1870,7 @@ namespace
LINEF("assert({0} != nullptr);", MakeTypeVarName(info->m_definition))
const auto* dynamicMember = computations.GetDynamicMember();
if (!info->m_has_matching_cross_platform_structure && dynamicMember && !info->m_non_embedded_reference_exists)
if (!MemoryLayoutMatches(*info) && dynamicMember && !info->m_non_embedded_reference_exists)
{
LINE("assert(!atStreamStart);")
}
@@ -1881,7 +1880,7 @@ namespace
LINE("if (atStreamStart)")
m_intendation++;
if (info->m_has_matching_cross_platform_structure)
if (MemoryLayoutMatches(*info))
{
if (dynamicMember == nullptr)
{
@@ -2073,7 +2072,7 @@ namespace
if (inTemp)
{
if (info->m_has_matching_cross_platform_structure)
if (MemoryLayoutMatches(*info))
{
LINEF("*{0} = m_stream.ConvertOffsetToAliasNative(*{0});", MakeTypePtrVarName(info->m_definition))
}