From 8d1776970097502f9cff5fb9504a656c8be3193c Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Tue, 26 Sep 2017 09:56:43 -0600 Subject: CCPR: Remove kCombinedTriangleHullsAndEdges Removes the mode that generates edge and hull geometry simultaneously from the geometry shader. Perf was hit and miss and it's not compatible with vertex shaders. We can revisit if geometry shaders still show promise on some platforms after a vertex shader impl is finished. Bug: skia: Change-Id: I984231e9a5bb60fe31d3ba280c7390a74aa5bc27 Reviewed-on: https://skia-review.googlesource.com/51300 Reviewed-by: Greg Daniel Commit-Queue: Chris Dalton --- src/gpu/ccpr/GrCCPRCoverageOp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gpu/ccpr/GrCCPRCoverageOp.cpp') diff --git a/src/gpu/ccpr/GrCCPRCoverageOp.cpp b/src/gpu/ccpr/GrCCPRCoverageOp.cpp index a923726713..0903d4b32b 100644 --- a/src/gpu/ccpr/GrCCPRCoverageOp.cpp +++ b/src/gpu/ccpr/GrCCPRCoverageOp.cpp @@ -396,7 +396,9 @@ void GrCCPRCoverageOp::onExecute(GrOpFlushState* flushState) { // Triangles. auto constexpr kTrianglesGrPrimitiveType = GrCCPRCoverageProcessor::kTrianglesGrPrimitiveType; - this->drawMaskPrimitives(flushState, pipeline, Mode::kCombinedTriangleHullsAndEdges, + this->drawMaskPrimitives(flushState, pipeline, Mode::kTriangleHulls, + kTrianglesGrPrimitiveType, 3, &PrimitiveTallies::fTriangles); + this->drawMaskPrimitives(flushState, pipeline, Mode::kTriangleEdges, kTrianglesGrPrimitiveType, 3, &PrimitiveTallies::fTriangles); this->drawMaskPrimitives(flushState, pipeline, Mode::kTriangleCorners, kTrianglesGrPrimitiveType, 3, &PrimitiveTallies::fTriangles); -- cgit v1.2.3