Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e392f13b authored by Nader Jawad's avatar Nader Jawad Committed by Automerger Merge Worker
Browse files

Merge "Fix assertion checks in libs/hwui/Mesh.cpp" into main am: 1a021aba 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2849416



Change-Id: Ibbe612b93ed36e59af12ce800fed1610057c7d85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3fb1be7 1a021aba

libs/hwui/Mesh.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -90,8 +90,8 @@ std::tuple<bool, SkString> Mesh::validate() { 
            FAIL_MESH_VALIDATE("%s mode requires at least %zu vertices but vertex count is %zu.",

            FAIL_MESH_VALIDATE("%s mode requires at least %zu vertices but vertex count is %zu.",

                               modeToStr(meshMode), min_vcount_for_mode(meshMode), mVertexCount);

                               modeToStr(meshMode), min_vcount_for_mode(meshMode), mVertexCount);

        }

        }

        SkASSERT(!fICount);

        LOG_ALWAYS_FATAL_IF(mIndexCount != 0);

        SkASSERT(!fIOffset);

        LOG_ALWAYS_FATAL_IF(mIndexOffset != 0);

    }

    }





    if (!sm.ok()) {

    if (!sm.ok()) {