From 2e7e4c33db92944019cfd8c806054f703629c122 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Wed, 29 Sep 2021 14:58:42 -0300 Subject: Remove `DeclarationPadding` and `DeclarationAlignment::None` (#186) * Nuke DeclarationPadding * Remove DeclarationAlignment::None * Fix AddDeclaration memory leaks * Run formatter * Remove extra AddDeclarationPlaceholder * Revert "Remove extra AddDeclarationPlaceholder" This reverts commit 7a5d6a19d80bb246e0a6c8fde009b2a00a84ef96. --- ZAPD/ZDisplayList.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ZAPD/ZDisplayList.cpp') diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp index 24353d4..d426e40 100644 --- a/ZAPD/ZDisplayList.cpp +++ b/ZAPD/ZDisplayList.cpp @@ -1850,7 +1850,7 @@ std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) if (parent != nullptr) { - parent->AddDeclarationArray(item.first, DeclarationAlignment::None, + parent->AddDeclarationArray(item.first, DeclarationAlignment::Align16, item.second.size() * 16, "static Vtx", StringHelper::Sprintf("%sVtx_%06X", prefix.c_str(), item.first, item.second.size()), @@ -1945,7 +1945,7 @@ std::string ZDisplayList::GetSourceOutputCode(const std::string& prefix) auto filepath = Globals::Instance->outputPath / vtxName; std::string incStr = StringHelper::Sprintf("%s.%s.inc", filepath.c_str(), "vtx"); - parent->AddDeclarationArray(vtxKeys[i], DeclarationAlignment::None, + parent->AddDeclarationArray(vtxKeys[i], DeclarationAlignment::Align16, item.size() * 16, "static Vtx", vtxName, item.size(), declaration); -- cgit v1.2.3