Math/FieldOffsets: Fix GetAlignedSize when using std430

NazaraEngine · Nov 17, 2024 · 093ff7c · 093ff7c
1 parent be7d599
commit 093ff7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/include/NZSL/Math/FieldOffsets.inl b/include/NZSL/Math/FieldOffsets.inl
@@ -118,10 +118,7 @@ namespace nzsl
 
 	constexpr std::size_t FieldOffsets::GetAlignedSize() const
 	{
-		if (m_layout == StructLayout::Std140)
-			return Nz::AlignPow2(m_size, m_largestFieldAlignment);
-		else
-			return m_size;
+		return Nz::AlignPow2(m_size, m_largestFieldAlignment);
 	}
 
 	constexpr std::size_t FieldOffsets::GetSize() const

diff --git a/tests/src/Tests/FieldOffsetsTests.cpp b/tests/src/Tests/FieldOffsetsTests.cpp
@@ -35,7 +35,8 @@ TEST_CASE("Field offsets", "[FieldOffsets]")
 		REQUIRE(fieldOffsets.AddStruct(innerStruct) == 56);
 		REQUIRE(fieldOffsets.AddField(nzsl::StructFieldType::Float3) == 64);
 		REQUIRE(fieldOffsets.AddField(nzsl::StructFieldType::Float1) == 76);
-		REQUIRE(fieldOffsets.GetAlignedSize() == 80);
+		REQUIRE(fieldOffsets.AddField(nzsl::StructFieldType::Float1) == 80);
+		REQUIRE(fieldOffsets.GetAlignedSize() == 96);
 	}
 }