diff options
author | 2017-06-13 14:45:23 +0000 | |
---|---|---|
committer | 2017-06-13 14:45:32 +0000 | |
commit | 7cd974fc7d7d1c197f961136775e188468f02ec9 (patch) | |
tree | 48eff63b1d2326320d6b62b01b8409925908d896 /src/gpu/ops/GrAAHairLinePathRenderer.cpp | |
parent | a611be86f044ae2d17ca5acc12895b53ca067d79 (diff) |
Revert "Add GrPrimitiveType::kLinesAdjacency"
This reverts commit f7eb015083aba8942031145736251dd32094115d.
Reason for revert: Looks like this is causing build failures:
* https://chromium-swarm.appspot.com/task?id=36baaf4d376bbf10&refresh=10
* https://chromium-swarm.appspot.com/task?id=36baad1f17e93510&refresh=10
Original change's description:
> Add GrPrimitiveType::kLinesAdjacency
>
> Converts GrPrimitiveType to an enum class and adds kLinesAdjacency.
>
> Bug: skia:
> Change-Id: If57d26277182aac1375e8181211ddaf7ea6d1e0a
> Reviewed-on: https://skia-review.googlesource.com/19581
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
TBR=bsalomon@google.com,csmartdalton@google.com
Change-Id: I37a1c575123b357abd8b9af9eea8871fe199f44b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/19661
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'src/gpu/ops/GrAAHairLinePathRenderer.cpp')
-rw-r--r-- | src/gpu/ops/GrAAHairLinePathRenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/ops/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp index 4d4b74f89b..26d58f4a95 100644 --- a/src/gpu/ops/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp @@ -860,7 +860,7 @@ void AAHairlineOp::onPrepareDraws(Target* target) const { add_line(&lines[2*i], toSrc, this->coverage(), &verts); } - GrMesh mesh(GrPrimitiveType::kTriangles); + GrMesh mesh(kTriangles_GrPrimitiveType); mesh.setIndexedPatterned(linesIndexBuffer.get(), kIdxsPerLineSeg, kLineSegNumVertices, lineCount, kLineSegsNumInIdxBuffer); mesh.setVertexData(vertexBuffer, firstVertex); @@ -917,7 +917,7 @@ void AAHairlineOp::onPrepareDraws(Target* target) const { } if (quadCount > 0) { - GrMesh mesh(GrPrimitiveType::kTriangles); + GrMesh mesh(kTriangles_GrPrimitiveType); mesh.setIndexedPatterned(quadsIndexBuffer.get(), kIdxsPerQuad, kQuadNumVertices, quadCount, kQuadsNumInIdxBuffer); mesh.setVertexData(vertexBuffer, firstVertex); @@ -926,7 +926,7 @@ void AAHairlineOp::onPrepareDraws(Target* target) const { } if (conicCount > 0) { - GrMesh mesh(GrPrimitiveType::kTriangles); + GrMesh mesh(kTriangles_GrPrimitiveType); mesh.setIndexedPatterned(quadsIndexBuffer.get(), kIdxsPerQuad, kQuadNumVertices, conicCount, kQuadsNumInIdxBuffer); mesh.setVertexData(vertexBuffer, firstVertex); |