From 92aee3d6857386f2b5b8e1148e680a7b58e9b1fc Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Wed, 21 Dec 2016 09:20:25 -0500 Subject: This renames methods and classes that relate to static analysis of combinations of GrDrawOps and GrPipelines. Change-Id: I737b901a19d3c67d2ff7f95802fb4df35656beb2 Reviewed-on: https://skia-review.googlesource.com/6199 Reviewed-by: Greg Daniel Commit-Queue: Brian Salomon --- src/gpu/ops/GrDashOp.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'src/gpu/ops/GrDashOp.cpp') diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp index 8052795ead..8a9dfe88a7 100644 --- a/src/gpu/ops/GrDashOp.cpp +++ b/src/gpu/ops/GrDashOp.cpp @@ -276,13 +276,6 @@ public: return string; } - void computePipelineOptimizations(GrInitInvariantOutput* color, - GrInitInvariantOutput* coverage, - GrBatchToXPOverrides* overrides) const override { - color->setKnownFourComponents(fColor); - coverage->setUnknownSingleComponent(); - } - private: DashOp(const LineData& geometry, GrColor color, SkPaint::Cap cap, AAMode aaMode, bool fullDash) : INHERITED(ClassID()), fColor(color), fCap(cap), fAAMode(aaMode), fFullDash(fullDash) { @@ -304,15 +297,19 @@ private: this->setTransformedBounds(bounds, combinedMatrix, aaBloat, zeroArea); } - void initBatchTracker(const GrXPOverridesForBatch& overrides) override { - // Handle any color overrides - if (!overrides.readsColor()) { + void getPipelineAnalysisInput(GrPipelineAnalysisDrawOpInput* input) const override { + input->pipelineColorInput()->setKnownFourComponents(fColor); + input->pipelineCoverageInput()->setUnknownSingleComponent(); + } + + void applyPipelineOptimizations(const GrPipelineOptimizations& optimizations) override { + if (!optimizations.readsColor()) { fColor = GrColor_ILLEGAL; } - overrides.getOverrideColorIfSet(&fColor); + optimizations.getOverrideColorIfSet(&fColor); - fUsesLocalCoords = overrides.readsLocalCoords(); - fCoverageIgnored = !overrides.readsCoverage(); + fUsesLocalCoords = optimizations.readsLocalCoords(); + fCoverageIgnored = !optimizations.readsCoverage(); } struct DashDraw { -- cgit v1.2.3