diff options
| author | 2023-09-25 19:04:28 +0000 | |
|---|---|---|
| committer | 2023-09-25 19:50:44 +0000 | |
| commit | 52c8b3167576e8fe9da2ab77b956f0840bcee9d9 (patch) | |
| tree | 3513e0a13577e616390edd1dac92d1297046a8fe | |
| parent | ffca9a616b562374dcb72c683a67ec3be0ca6b67 (diff) | |
Update calls to SkMesh::Make and MakeIndexed.
This API includes a `children` parameter now.
Change-Id: I10df70f2aba5419fe8ebc4c6c9cca6c0a8fd5d57
Bug: b/40045302
| -rw-r--r-- | libs/hwui/Mesh.h | 5 | ||||
| -rw-r--r-- | libs/hwui/RecordingCanvas.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libs/hwui/Mesh.h b/libs/hwui/Mesh.h index 764d1efcc8f4..69fda34afc78 100644 --- a/libs/hwui/Mesh.h +++ b/libs/hwui/Mesh.h @@ -166,11 +166,12 @@ public: #endif mMesh = SkMesh::MakeIndexed(mMeshSpec, meshMode, vb, mVertexCount, mVertexOffset, ib, mIndexCount, mIndexOffset, mBuilder->fUniforms, - mBounds) + SkSpan<SkRuntimeEffect::ChildPtr>(), mBounds) .mesh; } else { mMesh = SkMesh::Make(mMeshSpec, meshMode, vb, mVertexCount, mVertexOffset, - mBuilder->fUniforms, mBounds) + mBuilder->fUniforms, SkSpan<SkRuntimeEffect::ChildPtr>(), + mBounds) .mesh; } mIsDirty = false; diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp index 71f47e92e055..ff0d8d74831c 100644 --- a/libs/hwui/RecordingCanvas.cpp +++ b/libs/hwui/RecordingCanvas.cpp @@ -539,7 +539,7 @@ struct DrawSkMesh final : Op { if (!cpuMesh.indexBuffer()) { gpuMesh = SkMesh::Make(cpuMesh.refSpec(), cpuMesh.mode(), vb, cpuMesh.vertexCount(), cpuMesh.vertexOffset(), cpuMesh.refUniforms(), - cpuMesh.bounds()) + SkSpan<SkRuntimeEffect::ChildPtr>(), cpuMesh.bounds()) .mesh; } else { sk_sp<SkMesh::IndexBuffer> ib = @@ -547,7 +547,8 @@ struct DrawSkMesh final : Op { gpuMesh = SkMesh::MakeIndexed(cpuMesh.refSpec(), cpuMesh.mode(), vb, cpuMesh.vertexCount(), cpuMesh.vertexOffset(), ib, cpuMesh.indexCount(), cpuMesh.indexOffset(), - cpuMesh.refUniforms(), cpuMesh.bounds()) + cpuMesh.refUniforms(), + SkSpan<SkRuntimeEffect::ChildPtr>(), cpuMesh.bounds()) .mesh; } |