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 --- tests/OnFlushCallbackTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/OnFlushCallbackTest.cpp') diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp index 463e44f194..e9e4dd0462 100644 --- a/tests/OnFlushCallbackTest.cpp +++ b/tests/OnFlushCallbackTest.cpp @@ -156,7 +156,7 @@ private: } GrMesh mesh(GrPrimitiveType::kTriangles); - mesh.setIndexed(indexBuffer, 6, firstIndex, 0, 3); + mesh.setIndexed(indexBuffer, 6, firstIndex, 0, 3, GrPrimitiveRestart::kNo); mesh.setVertexData(vertexBuffer, firstVertex); target->draw(gp.get(), fHelper.makePipeline(target), mesh); -- cgit v1.2.3