Optimize SurfaceData bulk queries (#7593)

* Add comparison operators to SurfaceTagWeight. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Changed AddSurfaceTagWeight to always combine weights. This simplifies the API a bit and defines the behavior if someone ever tries to add a duplicate tag. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added benchmarks for measuring the performance-critical APIs. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Changed SurfaceTagWeights to a fixed_vector. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Add inPosition to AddSurfacePoint. This will be used to detect which input the surface point is associated with. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Add inPositionIndex to the appropriate APIs. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched Gradient Surface benchmarks to use actual surface components. The gradient unit tests and benchmarks were previously using a mock surface data system, which led to misleading benchmark results. Now, the actual SurfaceData system gets constructed, and the tests use a mock provider, but the benchmarks use actual shape providers for more realistic benchmarking. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed unit tests to have better query ranges. Half of each previous range was querying outside the surface provider's data. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * First attempt at removing SurfacePointLists. This currently runs significantly slower than the previous code but passes the unit tests. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Another attempt at optimization. This one runs faster than the previous, but still slow. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fix the cmake dependency so that the gradient tests rebuild SurfaceData.dll when run. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switch SurfaceAltitudeGradient over to the new bulk API. Also, optimized the non-bulk API by having it reuse the SurfacePointList to avoid the repeated allocation / deallocation cost. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched to using an indirect index so that all allocations are consecutive in our reserved buffer. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched back to SurfaceTagWeight again. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added runtime dependency to LmbrCentral for unit tests. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Switched code over to use the full EnumeratePoints in most cases. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added knowledge of max surface point creation into the system. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Add generic GetSurfacePointsFromList API implementation for surface providers. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed implementation to use the correct maximum number of input points based on the surface providers being queried. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fix out-of-bounds references on empty lists. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fix memory allocation that caused benchmark runs to crash. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Starting to clean up the API. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Move SurfacePointList into separate files for easier maintainability. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed bug where too many points were filtered out due to using the position Z as a part of the AABB check. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Made FilterPoints an internal part of SurfacePointList so we can choose when and how to perform the filtering. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Final cleanup / comments. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added includes for non-unity builds. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Changed how unit tests initialize the mock lists to try and fix the linux errors. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Fixed compile error. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-02-14 16:27:53 -06:00
parent d2cdb511d0
commit 8b82041361
32 changed files with 970 additions and 514 deletions
@@ -213,7 +213,7 @@ namespace UnitTest
        // Query every point in our world at 1 meter intervals.
        for ([[maybe_unused]] auto _ : state)
        {
-            SurfaceData::SurfacePointLists points;
+            SurfaceData::SurfacePointList points;

            AZ::Aabb inRegion = AZ::Aabb::CreateFromMinMax(AZ::Vector3(0.0f), AZ::Vector3(worldSize));
            AZ::Vector2 stepSize(1.0f);
@@ -248,7 +248,7 @@ namespace UnitTest
                }
            }

-            SurfaceData::SurfacePointLists points;
+            SurfaceData::SurfacePointList points;

            SurfaceData::SurfaceDataSystemRequestBus::Broadcast(
                &SurfaceData::SurfaceDataSystemRequestBus::Events::GetSurfacePointsFromList, queryPositions, filterTags, points);
@@ -135,14 +135,17 @@ namespace UnitTest

            // Call GetSurfacePoints and verify the results
            SurfaceData::SurfacePointList pointList;
+            pointList.StartListConstruction(AZStd::span<const AZ::Vector3>(&queryPoint, 1), 1, {});
            SurfaceData::SurfaceDataProviderRequestBus::Event(providerHandle, &SurfaceData::SurfaceDataProviderRequestBus::Events::GetSurfacePoints,
                                                              queryPoint, pointList);
+            pointList.EndListConstruction();
+
            if (pointOnProvider)
            {
                ASSERT_EQ(pointList.GetSize(), 1);
-                pointList.EnumeratePoints(
-                    [this, expectedOutput](
-                        const AZ::Vector3& position, const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
+                pointList.EnumeratePoints([this, expectedOutput](
+                        [[maybe_unused]] size_t inPositionIndex, const AZ::Vector3& position,
+                        const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
                    {
                        EXPECT_TRUE(SurfacePointsAreEqual(position, normal, masks, expectedOutput));
                        return true;
@@ -185,12 +188,14 @@ namespace UnitTest
            // Call ModifySurfacePoints and verify the results
            // Add the surface point with a different entity ID than the entity doing the modification, so that the point doesn't get
            // filtered out.
-            SurfaceData::SurfacePointList pointList = { input };
+            SurfaceData::SurfacePointList pointList;
+            pointList.StartListConstruction(AZStd::span<const AzFramework::SurfaceData::SurfacePoint>(&input, 1));
            SurfaceData::SurfaceDataModifierRequestBus::Event(modifierHandle, &SurfaceData::SurfaceDataModifierRequestBus::Events::ModifySurfacePoints, pointList);
+            pointList.EndListConstruction();
            ASSERT_EQ(pointList.GetSize(), 1);
-            pointList.EnumeratePoints(
-                [this, expectedOutput](
-                    const AZ::Vector3& position, const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
+            pointList.EnumeratePoints([this, expectedOutput](
+                    [[maybe_unused]] size_t inPositionIndex, const AZ::Vector3& position,
+                    const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
                {
                    EXPECT_TRUE(SurfacePointsAreEqual(position, normal, masks, expectedOutput));
                    return true;
@@ -114,6 +114,14 @@ class MockSurfaceProvider

            if (m_providerType == ProviderType::SURFACE_PROVIDER)
            {
+                // If the mock provider is generating points, examine the size of the points lists we've added to the mock provider
+                // to determine the maximum number of points that we will output from a single input position.
+                registryEntry.m_maxPointsCreatedPerInput = 1;
+                for (auto& entry : m_GetSurfacePoints)
+                {
+                    registryEntry.m_maxPointsCreatedPerInput = AZ::GetMax(registryEntry.m_maxPointsCreatedPerInput, entry.second.size());
+                }
+
                SurfaceData::SurfaceDataSystemRequestBus::BroadcastResult(m_providerHandle, &SurfaceData::SurfaceDataSystemRequestBus::Events::RegisterSurfaceDataProvider, registryEntry);
                SurfaceData::SurfaceDataProviderRequestBus::Handler::BusConnect(m_providerHandle);
            }
@@ -152,7 +160,7 @@ class MockSurfaceProvider
                for (auto& point : surfacePoints->second)
                {
                    SurfaceData::SurfaceTagWeights weights(point.m_surfaceTags);
-                    surfacePointList.AddSurfacePoint(m_id, point.m_position, point.m_normal, weights);
+                    surfacePointList.AddSurfacePoint(m_id, inPosition, point.m_position, point.m_normal, weights);
                }
            }
        }
@@ -208,19 +216,22 @@ public:
    }

    void CompareSurfacePointListWithGetSurfacePoints(
-        const AZStd::vector<AZ::Vector3>& queryPositions, SurfaceData::SurfacePointLists& surfacePointLists,
+        const AZStd::vector<AZ::Vector3>& queryPositions, SurfaceData::SurfacePointList& surfacePointLists,
        const SurfaceData::SurfaceTagVector& testTags)
    {
        AZStd::vector<AzFramework::SurfaceData::SurfacePoint> singleQueryResults;
+        SurfaceData::SurfacePointList tempSingleQueryPointList;

-        for (auto& queryPosition : queryPositions)
+        for (size_t inputIndex = 0; inputIndex < queryPositions.size(); inputIndex++)
        {
-            SurfaceData::SurfacePointList tempSingleQueryPointList;
+            tempSingleQueryPointList.Clear();
+            singleQueryResults.clear();
+
            SurfaceData::SurfaceDataSystemRequestBus::Broadcast(
-                &SurfaceData::SurfaceDataSystemRequestBus::Events::GetSurfacePoints, queryPosition, testTags, tempSingleQueryPointList);
-            tempSingleQueryPointList.EnumeratePoints(
-                [&singleQueryResults](
-                    const AZ::Vector3& position, const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
+                &SurfaceData::SurfaceDataSystemRequestBus::Events::GetSurfacePoints, queryPositions[inputIndex], testTags, tempSingleQueryPointList);
+            tempSingleQueryPointList.EnumeratePoints([&singleQueryResults](
+                    [[maybe_unused]] size_t inPositionIndex, const AZ::Vector3& position,
+                    const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
                {
                    AzFramework::SurfaceData::SurfacePoint point;
                    point.m_position = position;
@@ -229,28 +240,23 @@ public:
                    singleQueryResults.emplace_back(AZStd::move(point));
                    return true;
                });
-        }

-        // Verify that each point in each list is equal.
-        AzFramework::SurfaceData::SurfacePoint* singleQueryPoint = singleQueryResults.begin();
-        for (size_t listIndex = 0; listIndex < surfacePointLists.size(); listIndex++)
-        {
-            auto& surfacePointList = surfacePointLists[listIndex];
-            surfacePointList.EnumeratePoints(
-                [&singleQueryPoint, singleQueryResults](
+            size_t resultIndex = 0;
+            surfacePointLists.EnumeratePoints(
+                inputIndex,
+                [&resultIndex, singleQueryResults](
                    const AZ::Vector3& position, const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
                {
-                    EXPECT_NE(singleQueryPoint, singleQueryResults.end());
+                    EXPECT_NE(resultIndex, singleQueryResults.size());

-                    EXPECT_EQ(position, singleQueryPoint->m_position);
-                    EXPECT_EQ(normal, singleQueryPoint->m_normal);
-                    EXPECT_TRUE(masks.SurfaceWeightsAreEqual(singleQueryPoint->m_surfaceTags));
-                    ++singleQueryPoint;
+                    EXPECT_EQ(position, singleQueryResults[resultIndex].m_position);
+                    EXPECT_EQ(normal, singleQueryResults[resultIndex].m_normal);
+                    EXPECT_TRUE(masks.SurfaceWeightsAreEqual(singleQueryResults[resultIndex].m_surfaceTags));
+                    ++resultIndex;
                    return true;
                });
+            EXPECT_EQ(resultIndex, singleQueryResults.size());
        }
-
-        EXPECT_EQ(singleQueryPoint, singleQueryResults.end());
    }


@@ -484,7 +490,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion)
    // Query for all the surface points from (0, 0, 16) - (4, 4, 16) with a step size of 1.
    // Note that the Z range is deliberately chosen to be outside the surface provider range to demonstrate
    // that it is ignored when selecting points.
-    SurfaceData::SurfacePointLists availablePointsPerPosition;
+    SurfaceData::SurfacePointList availablePointsPerPosition;
    AZ::Vector2 stepSize(1.0f, 1.0f);
    AZ::Aabb regionBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(0.0f, 0.0f, 16.0f), AZ::Vector3(4.0f, 4.0f, 16.0f));
    SurfaceData::SurfaceTagVector testTags = providerTags;
@@ -496,21 +502,17 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion)
    // We expect every entry in the output list to have two surface points, at heights 0 and 4, sorted in
    // decreasing height order.  The masks list should be the same size as the set of masks the provider owns.
    // We *could* check every mask as well for completeness, but that seems like overkill.
-    for (auto& pointList : availablePointsPerPosition)
-    {
-        EXPECT_EQ(pointList.GetSize(), 2);
-        float expectedZ = 4.0f;
-        pointList.EnumeratePoints(
-            [providerTags,
-             &expectedZ](const AZ::Vector3& position, [[maybe_unused]] const AZ::Vector3& normal,
-                 const SurfaceData::SurfaceTagWeights& masks) -> bool
-            {
-                EXPECT_EQ(position.GetZ(), expectedZ);
-                EXPECT_EQ(masks.GetSize(), providerTags.size());
-                expectedZ = (expectedZ == 4.0f) ? 0.0f : 4.0f;
-                return true;
-            });
-    }
+    float expectedZ = 4.0f;
+    availablePointsPerPosition.EnumeratePoints(
+        [availablePointsPerPosition, providerTags, &expectedZ](size_t inPositionIndex, const AZ::Vector3& position,
+            [[maybe_unused]] const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
+        {
+            EXPECT_EQ(availablePointsPerPosition.GetSize(inPositionIndex), 2);
+            EXPECT_EQ(position.GetZ(), expectedZ);
+            EXPECT_EQ(masks.GetSize(), providerTags.size());
+            expectedZ = (expectedZ == 4.0f) ? 0.0f : 4.0f;
+            return true;
+        });
 }

 TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_NoMatchingMasks)
@@ -525,7 +527,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_NoMatchingMas

    // Query for all the surface points from (0, 0, 0) - (4, 4, 4) with a step size of 1.
    // We only include a surface tag that does NOT exist in the surface provider.
-    SurfaceData::SurfacePointLists availablePointsPerPosition;
+    SurfaceData::SurfacePointList availablePointsPerPosition;
    AZ::Vector2 stepSize(1.0f, 1.0f);
    AZ::Aabb regionBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(0.0f), AZ::Vector3(4.0f));
    SurfaceData::SurfaceTagVector testTags = { SurfaceData::SurfaceTag(m_testSurfaceNoMatchCrc) };
@@ -536,10 +538,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_NoMatchingMas

    // We expect every entry in the output list to have no surface points, since the requested mask doesn't match
    // any of the masks from our mock surface provider.
-    for (auto& queryPosition : availablePointsPerPosition)
-    {
-        EXPECT_TRUE(queryPosition.IsEmpty());
-    }
+    EXPECT_TRUE(availablePointsPerPosition.IsEmpty());
 }

 TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_NoMatchingRegion)
@@ -553,7 +552,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_NoMatchingReg
                                     AZ::Vector3(0.0f), AZ::Vector3(8.0f), AZ::Vector3(0.25f, 0.25f, 4.0f));

    // Query for all the surface points from (16, 16) - (20, 20) with a step size of 1.
-    SurfaceData::SurfacePointLists availablePointsPerPosition;
+    SurfaceData::SurfacePointList availablePointsPerPosition;
    AZ::Vector2 stepSize(1.0f, 1.0f);
    AZ::Aabb regionBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(16.0f), AZ::Vector3(20.0f));
    SurfaceData::SurfaceTagVector testTags = providerTags;
@@ -564,10 +563,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_NoMatchingReg

    // We expect every entry in the output list to have no surface points, since the input points don't overlap with
    // our surface provider.
-    for (auto& pointList : availablePointsPerPosition)
-    {
-        EXPECT_TRUE(pointList.IsEmpty());
-    }
+    EXPECT_TRUE(availablePointsPerPosition.IsEmpty());
 }

 TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_ProviderModifierMasksCombine)
@@ -603,7 +599,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_ProviderModif

    for (auto& tagTest : tagTests)
    {
-        SurfaceData::SurfacePointLists availablePointsPerPosition;
+        SurfaceData::SurfacePointList availablePointsPerPosition;
        AZ::Vector2 stepSize(1.0f, 1.0f);
        AZ::Aabb regionBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(0.0f), AZ::Vector3(4.0f));
        SurfaceData::SurfaceTagVector testTags = tagTest;
@@ -614,20 +610,17 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_ProviderModif

        // We expect every entry in the output list to have two surface points (with heights 0 and 4),
        // and each point should have both the "test_surface1" and "test_surface2" tag.
-        for (auto& pointList : availablePointsPerPosition)
-        {
-            EXPECT_EQ(pointList.GetSize(), 2);
-            float expectedZ = 4.0f;
-            pointList.EnumeratePoints(
-                [&expectedZ](const AZ::Vector3& position,
-                    [[maybe_unused]] const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
-                {
-                    EXPECT_EQ(position.GetZ(), expectedZ);
-                    EXPECT_EQ(masks.GetSize(), 2);
-                    expectedZ = (expectedZ == 4.0f) ? 0.0f : 4.0f;
-                    return true;
-                });
-        }
+        float expectedZ = 4.0f;
+        availablePointsPerPosition.EnumeratePoints(
+            [availablePointsPerPosition, &expectedZ](size_t inPositionIndex, const AZ::Vector3& position,
+                [[maybe_unused]] const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
+            {
+                EXPECT_EQ(availablePointsPerPosition.GetSize(inPositionIndex), 2);
+                EXPECT_EQ(position.GetZ(), expectedZ);
+                EXPECT_EQ(masks.GetSize(), 2);
+                expectedZ = (expectedZ == 4.0f) ? 0.0f : 4.0f;
+                return true;
+            });
    }
 }

@@ -653,7 +646,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_SimilarPoints


    // Query for all the surface points from (0, 0) - (4, 4) with a step size of 1.
-    SurfaceData::SurfacePointLists availablePointsPerPosition;
+    SurfaceData::SurfacePointList availablePointsPerPosition;
    AZ::Vector2 stepSize(1.0f, 1.0f);
    AZ::Aabb regionBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(0.0f), AZ::Vector3(4.0f));
    SurfaceData::SurfaceTagVector testTags = { SurfaceData::SurfaceTag(m_testSurface1Crc), SurfaceData::SurfaceTag(m_testSurface2Crc) };
@@ -664,23 +657,21 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_SimilarPoints

    // We expect every entry in the output list to have two surface points, not four.  The two points
    // should have both surface tags on them.
-    for (auto& pointList : availablePointsPerPosition)
-    {
-        EXPECT_EQ(pointList.GetSize(), 2);
-        float expectedZ = 4.0f;
-        pointList.EnumeratePoints(
-            [&expectedZ](
-                const AZ::Vector3& position, [[maybe_unused]] const AZ::Vector3& normal,
-                const SurfaceData::SurfaceTagWeights& masks) -> bool
-            {
-                // Similar points get merged, but there's no guarantee which value will be kept, so we set our comparison tolerance
-                // high enough to allow both x.0 and x.0005 to pass.
-                EXPECT_NEAR(position.GetZ(), expectedZ, 0.001f);
-                EXPECT_EQ(masks.GetSize(), 2);
-                expectedZ = (expectedZ == 4.0f) ? 0.0f : 4.0f;
-                return true;
-            });
-    }
+    float expectedZ = 4.0f;
+    availablePointsPerPosition.EnumeratePoints(
+        [availablePointsPerPosition, &expectedZ](
+            size_t inPositionIndex, const AZ::Vector3& position, [[maybe_unused]] const AZ::Vector3& normal,
+            const SurfaceData::SurfaceTagWeights& masks) -> bool
+        {
+            EXPECT_EQ(availablePointsPerPosition.GetSize(inPositionIndex), 2);
+
+            // Similar points get merged, but there's no guarantee which value will be kept, so we set our comparison tolerance
+            // high enough to allow both x.0 and x.0005 to pass.
+            EXPECT_NEAR(position.GetZ(), expectedZ, 0.001f);
+            EXPECT_EQ(masks.GetSize(), 2);
+            expectedZ = (expectedZ == 4.0f) ? 0.0f : 4.0f;
+            return true;
+        });
 }

 TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_DissimilarPointsDoNotMergeTogether)
@@ -704,7 +695,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_DissimilarPoi


    // Query for all the surface points from (0, 0) - (4, 4) with a step size of 1.
-    SurfaceData::SurfacePointLists availablePointsPerPosition;
+    SurfaceData::SurfacePointList availablePointsPerPosition;
    AZ::Vector2 stepSize(1.0f, 1.0f);
    AZ::Aabb regionBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(0.0f), AZ::Vector3(4.0f));
    SurfaceData::SurfaceTagVector testTags = { SurfaceData::SurfaceTag(m_testSurface1Crc), SurfaceData::SurfaceTag(m_testSurface2Crc) };
@@ -715,17 +706,14 @@ TEST_F(SurfaceDataTestApp, SurfaceData_TestSurfacePointsFromRegion_DissimilarPoi

    // We expect every entry in the output list to have four surface points with one tag each,
    // because the points are far enough apart that they won't merge.
-    for (auto& pointList : availablePointsPerPosition)
-    {
-        EXPECT_EQ(pointList.GetSize(), 4);
-        pointList.EnumeratePoints(
-            []([[maybe_unused]] const AZ::Vector3& position, [[maybe_unused]] const AZ::Vector3& normal,
-               const SurfaceData::SurfaceTagWeights& masks) -> bool
-            {
-                EXPECT_EQ(masks.GetSize(), 1);
-                return true;
-            });
-    }
+    availablePointsPerPosition.EnumeratePoints(
+        [availablePointsPerPosition](size_t inPositionIndex, [[maybe_unused]] const AZ::Vector3& position,
+            [[maybe_unused]] const AZ::Vector3& normal, const SurfaceData::SurfaceTagWeights& masks) -> bool
+        {
+            EXPECT_EQ(availablePointsPerPosition.GetSize(inPositionIndex), 4);
+            EXPECT_EQ(masks.GetSize(), 1);
+            return true;
+        });
 }

 TEST_F(SurfaceDataTestApp, SurfaceData_VerifyGetSurfacePointsFromRegionAndGetSurfacePointsMatch)
@@ -741,7 +729,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_VerifyGetSurfacePointsFromRegionAndGetSur
        AZ::Vector3(0.25f, 0.25f, 4.0f));

    // Query for all the surface points from (0, 0, 16) - (4, 4, 16) with a step size of 1.
-    SurfaceData::SurfacePointLists availablePointsPerPosition;
+    SurfaceData::SurfacePointList availablePointsPerPosition;
    AZ::Vector2 stepSize(1.0f, 1.0f);
    AZ::Aabb regionBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(0.0f, 0.0f, 16.0f), AZ::Vector3(4.0f, 4.0f, 16.0f));

@@ -775,7 +763,7 @@ TEST_F(SurfaceDataTestApp, SurfaceData_VerifyGetSurfacePointsFromListAndGetSurfa
        AZ::Vector3(0.25f, 0.25f, 4.0f));

    // Query for all the surface points from (0, 0, 16) - (4, 4, 16) with a step size of 1.
-    SurfaceData::SurfacePointLists availablePointsPerPosition;
+    SurfaceData::SurfacePointList availablePointsPerPosition;
    AZStd::vector<AZ::Vector3> queryPositions;
    for (float y = 0.0f; y < 4.0f; y += 1.0f)
    {
@@ -789,8 +777,6 @@ TEST_F(SurfaceDataTestApp, SurfaceData_VerifyGetSurfacePointsFromListAndGetSurfa
        &SurfaceData::SurfaceDataSystemRequestBus::Events::GetSurfacePointsFromList,
        queryPositions, providerTags, availablePointsPerPosition);

-    EXPECT_EQ(availablePointsPerPosition.size(), 16);
-
    // For each point entry returned from GetSurfacePointsFromList, call GetSurfacePoints and verify the results match.
    CompareSurfacePointListWithGetSurfacePoints(queryPositions, availablePointsPerPosition, providerTags);
 }