From 703b476fa4adc0af369728f7a150aaf12af7434f Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Fri, 6 Apr 2018 16:11:48 -0600 Subject: ccpr: Remove WindMethod from GrCCCoverageProcessor Handles weighted triangles from the tessellator instead with a "kWeightedTriangles" PrimitiveType. Bug: skia: Change-Id: I8a6f7b4205e1b3d6f340a30f3e90079ec44b8b6d Reviewed-on: https://skia-review.googlesource.com/119202 Reviewed-by: Brian Salomon Commit-Queue: Chris Dalton --- samplecode/SampleCCPRGeometry.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'samplecode') diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp index ea3eafb591..7ddf91f0ae 100644 --- a/samplecode/SampleCCPRGeometry.cpp +++ b/samplecode/SampleCCPRGeometry.cpp @@ -204,7 +204,8 @@ void CCPRGeometryView::onDrawContent(SkCanvas* canvas) { SkRect::MakeIWH(this->width(), this->height())); // Add label. - caption.appendf("RenderPass_%s", GrCCCoverageProcessor::PrimitiveTypeName(fPrimitiveType)); + caption.appendf("PrimitiveType_%s", + GrCCCoverageProcessor::PrimitiveTypeName(fPrimitiveType)); if (PrimitiveType::kCubics == fPrimitiveType) { caption.appendf(" (%s)", SkCubicTypeName(fCubicType)); } @@ -295,8 +296,7 @@ void CCPRGeometryView::DrawCoverageCountOp::onExecute(GrOpFlushState* state) { ? static_cast(state->gpu()) : nullptr; - GrCCCoverageProcessor proc(rp, fView->fPrimitiveType, - GrCCCoverageProcessor::WindMethod::kCrossProduct); + GrCCCoverageProcessor proc(rp, fView->fPrimitiveType); SkDEBUGCODE(proc.enableDebugBloat(kDebugBloat)); SkSTArray<1, GrMesh> mesh; @@ -390,6 +390,9 @@ bool CCPRGeometryView::onQuery(SkEvent* evt) { if (SampleCode::CharQ(*evt, &unichar)) { if (unichar >= '1' && unichar <= '3') { fPrimitiveType = PrimitiveType(unichar - '1'); + if (fPrimitiveType >= PrimitiveType::kWeightedTriangles) { + fPrimitiveType = (PrimitiveType) ((int)fPrimitiveType + 1); + } this->updateAndInval(); return true; } -- cgit v1.2.3