From e7d30484ea8a5677a9403ccd23a9c0961df62ccd Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Wed, 29 Mar 2017 12:09:15 -0400 Subject: Remove GrPipelineOptimizations computation from GrPipeline::init and nest in GrMeshDrawOp. Change-Id: I4a702c83857606c1cb050294c408922eef5769ea Reviewed-on: https://skia-review.googlesource.com/10414 Commit-Queue: Brian Salomon Reviewed-by: Greg Daniel --- src/gpu/GrPipeline.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/gpu/GrPipeline.h') diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index 21693426f1..7c861b2c1e 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -12,7 +12,6 @@ #include "GrFragmentProcessor.h" #include "GrNonAtomicRef.h" #include "GrPendingProgramElement.h" -#include "GrPrimitiveProcessor.h" #include "GrProcessorSet.h" #include "GrProgramDesc.h" #include "GrScissorState.h" @@ -79,7 +78,7 @@ public: GrPipeline(GrRenderTarget*, SkBlendMode); /** (Re)initializes a pipeline. After initialization the pipeline can be used. */ - GrPipelineOptimizations init(const InitArgs&); + void init(const InitArgs&); /** True if the pipeline has been initialized. */ bool isInitialized() const { return SkToBool(fRenderTarget.get()); } -- cgit v1.2.3