Merge "Update calls to SkMesh::Make and MakeIndexed." into main (e2692daf) · Commits · e / os / android_frameworks_base

libs/hwui/Mesh.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}