| commit | e392f13b295bca3583d98a861435e576f4940176 | [log] [tgz] |
|---|---|---|
| author | Nader Jawad <njawad@google.com> | Thu Nov 30 21:58:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 30 21:58:16 2023 +0000 |
| tree | 64d75c0e7691604ce7d6f3121485946d8e90c649 | |
| parent | c3fb1be7b3b5e5e08f79a3fb539f139be6f86976 [diff] | |
| parent | 1a021abab1475499524237ea2ae880fdd2fbe3f8 [diff] |
Merge "Fix assertion checks in libs/hwui/Mesh.cpp" into main am: 1a021abab1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2849416 Change-Id: Ibbe612b93ed36e59af12ce800fed1610057c7d85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/hwui/Mesh.cpp b/libs/hwui/Mesh.cpp index e59bc95..37a7d74 100644 --- a/libs/hwui/Mesh.cpp +++ b/libs/hwui/Mesh.cpp
@@ -90,8 +90,8 @@ FAIL_MESH_VALIDATE("%s mode requires at least %zu vertices but vertex count is %zu.", modeToStr(meshMode), min_vcount_for_mode(meshMode), mVertexCount); } - SkASSERT(!fICount); - SkASSERT(!fIOffset); + LOG_ALWAYS_FATAL_IF(mIndexCount != 0); + LOG_ALWAYS_FATAL_IF(mIndexOffset != 0); } if (!sm.ok()) {