From 2895eeb11a9f0d9c0018d49dd4bc45f6c6fc062c Mon Sep 17 00:00:00 2001 From: robertphillips Date: Thu, 21 Jul 2016 12:04:08 -0700 Subject: Retract PipelineBuilder some more The main part of this CL is widening SkDrawContext::drawBatch's API to accept the userStencilSettings & drawFace There is some ancillary spookiness related to expanding the should_apply_coverage_aa & mustUseHWAA methods to encompass mixedSamples Calved off: https://codereview.chromium.org/2165283002/ (Remove DrawFace enum from GrPipelineBuilder) https://codereview.chromium.org/2167183002/ (Minor change to Ganesh path renderers) GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2092893003 Review-Url: https://codereview.chromium.org/2092893003 --- src/gpu/batches/GrTessellatingPathRenderer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/gpu/batches/GrTessellatingPathRenderer.cpp') diff --git a/src/gpu/batches/GrTessellatingPathRenderer.cpp b/src/gpu/batches/GrTessellatingPathRenderer.cpp index 6dce9f73c8..3ef9a5184a 100644 --- a/src/gpu/batches/GrTessellatingPathRenderer.cpp +++ b/src/gpu/batches/GrTessellatingPathRenderer.cpp @@ -14,7 +14,6 @@ #include "GrDefaultGeoProcFactory.h" #include "GrMesh.h" #include "GrPathUtils.h" -#include "GrPipelineBuilder.h" #include "GrResourceCache.h" #include "GrResourceProvider.h" #include "GrTessellator.h" @@ -272,10 +271,7 @@ bool GrTessellatingPathRenderer::onDrawPath(const DrawPathArgs& args) { *args.fShape, *args.fViewMatrix, clipBounds)); - GrPipelineBuilder pipelineBuilder(*args.fPaint, args.fDrawContext->mustUseHWAA(*args.fPaint)); - pipelineBuilder.setUserStencil(args.fUserStencilSettings); - - args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch); + args.fDrawContext->drawBatch(*args.fPaint, *args.fClip, *args.fUserStencilSettings, batch); return true; } -- cgit v1.2.3