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/instanced/InstancedRendering.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/gpu/instanced/InstancedRendering.cpp') diff --git a/src/gpu/instanced/InstancedRendering.cpp b/src/gpu/instanced/InstancedRendering.cpp index 2a248a55af..ec6a9c99fb 100644 --- a/src/gpu/instanced/InstancedRendering.cpp +++ b/src/gpu/instanced/InstancedRendering.cpp @@ -334,21 +334,20 @@ void InstancedRendering::Op::appendParamsTexel(SkScalar x, SkScalar y, SkScalar fInfo.fHasParams = true; } -void InstancedRendering::Op::computePipelineOptimizations(GrInitInvariantOutput* color, - GrInitInvariantOutput* coverage, - GrBatchToXPOverrides* overrides) const { - color->setKnownFourComponents(this->getSingleInstance().fColor); +void InstancedRendering::Op::getPipelineAnalysisInput(GrPipelineAnalysisDrawOpInput* input) const { + input->pipelineColorInput()->setKnownFourComponents(this->getSingleInstance().fColor); if (AntialiasMode::kCoverage == fInfo.fAntialiasMode || (AntialiasMode::kNone == fInfo.fAntialiasMode && !fInfo.isSimpleRects() && fInfo.fCannotDiscard)) { - coverage->setUnknownSingleComponent(); + input->pipelineCoverageInput()->setUnknownSingleComponent(); } else { - coverage->setKnownSingleComponent(255); + input->pipelineCoverageInput()->setKnownSingleComponent(255); } } -void InstancedRendering::Op::initBatchTracker(const GrXPOverridesForBatch& overrides) { +void InstancedRendering::Op::applyPipelineOptimizations( + const GrPipelineOptimizations& optimizations) { Draw& draw = this->getSingleDraw(); // This will assert if we have > 1 command. SkASSERT(draw.fGeometry.isEmpty()); SkASSERT(SkIsPow2(fInfo.fShapeTypes)); @@ -370,12 +369,12 @@ void InstancedRendering::Op::initBatchTracker(const GrXPOverridesForBatch& overr } GrColor overrideColor; - if (overrides.getOverrideColorIfSet(&overrideColor)) { + if (optimizations.getOverrideColorIfSet(&overrideColor)) { SkASSERT(State::kRecordingDraws == fInstancedRendering->fState); this->getSingleInstance().fColor = overrideColor; } - fInfo.fUsesLocalCoords = overrides.readsLocalCoords(); - fInfo.fCannotTweakAlphaForCoverage = !overrides.canTweakAlphaForCoverage(); + fInfo.fUsesLocalCoords = optimizations.readsLocalCoords(); + fInfo.fCannotTweakAlphaForCoverage = !optimizations.canTweakAlphaForCoverage(); fInstancedRendering->fTrackedOps.addToTail(this); fIsTracked = true; @@ -475,7 +474,7 @@ void InstancedRendering::Op::onDraw(GrOpFlushState* state, const SkRect& bounds) } void InstancedRendering::endFlush() { - // The caller is expected to delete all tracked ops (i.e. ops whose initBatchTracker + // The caller is expected to delete all tracked ops (i.e. ops whose applyPipelineOptimizations // method has been called) before ending the flush. SkASSERT(fTrackedOps.isEmpty()); fParams.reset(); -- cgit v1.2.3