From 802cb318f695d5c3ade20b6424c97ea548a929b2 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 8 Jun 2018 18:05:20 -0400 Subject: Stop passing GrPrimitiveProcessor to GrMesh::sendToGpu. It is currently used in GrGLGpu::setupGeometry. Instead: 1) Make GrMesh track whether primitive restart should be enabled. 2) Make GrGLProgram track program attributes. Change-Id: Ice411a495961fcbc3cedc81e8ae0583537f42153 Reviewed-on: https://skia-review.googlesource.com/132267 Commit-Queue: Brian Salomon Reviewed-by: Chris Dalton --- src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp') diff --git a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp index 2c1ea50fc3..02520c1df7 100644 --- a/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp +++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp @@ -229,7 +229,8 @@ private: return; } memcpy(idxs, indices, indexCount * sizeof(uint16_t)); - mesh.setIndexed(indexBuffer, indexCount, firstIndex, 0, vertexCount - 1); + mesh.setIndexed(indexBuffer, indexCount, firstIndex, 0, vertexCount - 1, + GrPrimitiveRestart::kNo); mesh.setVertexData(vertexBuffer, firstVertex); target->draw(gp, pipeline, mesh); } -- cgit v1.2.3