diff options
Diffstat (limited to 'src/gpu/ops/GrAtlasTextOp.cpp')
-rw-r--r-- | src/gpu/ops/GrAtlasTextOp.cpp | 64 |
1 files changed, 29 insertions, 35 deletions
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp index a7b4967143..9c4172ceaf 100644 --- a/src/gpu/ops/GrAtlasTextOp.cpp +++ b/src/gpu/ops/GrAtlasTextOp.cpp @@ -34,45 +34,40 @@ SkString GrAtlasTextOp::dumpInfo() const { fGeoData[i].fBlob->runCount()); } - str += fProcessors.dumpProcessors(); - str += INHERITED::dumpInfo(); + str.append(DumpPipelineInfo(*this->pipeline())); + str.append(INHERITED::dumpInfo()); return str; } -GrDrawOp::FixedFunctionFlags GrAtlasTextOp::fixedFunctionFlags() const { - return FixedFunctionFlags::kNone; -} - -GrDrawOp::RequiresDstTexture GrAtlasTextOp::finalize(const GrCaps& caps, - const GrAppliedClip* clip) { - GrProcessorAnalysisCoverage coverage; - GrProcessorAnalysisColor color; +void GrAtlasTextOp::getProcessorAnalysisInputs(GrProcessorAnalysisColor* color, + GrProcessorAnalysisCoverage* coverage) const { if (kColorBitmapMask_MaskType == fMaskType) { - color.setToUnknown(); + color->setToUnknown(); } else { - color.setToConstant(fColor); + color->setToConstant(fColor); } switch (fMaskType) { case kGrayscaleCoverageMask_MaskType: case kAliasedDistanceField_MaskType: case kGrayscaleDistanceField_MaskType: - coverage = GrProcessorAnalysisCoverage::kSingleChannel; + *coverage = GrProcessorAnalysisCoverage::kSingleChannel; break; case kLCDCoverageMask_MaskType: case kLCDDistanceField_MaskType: case kLCDBGRDistanceField_MaskType: - coverage = GrProcessorAnalysisCoverage::kLCD; + *coverage = GrProcessorAnalysisCoverage::kLCD; break; case kColorBitmapMask_MaskType: - coverage = GrProcessorAnalysisCoverage::kNone; + *coverage = GrProcessorAnalysisCoverage::kNone; break; } - auto analysis = fProcessors.finalize(color, coverage, clip, false, caps, &fColor); - fUsesLocalCoords = analysis.usesLocalCoords(); - fCanCombineOnTouchOrOverlap = - !analysis.requiresDstTexture() && - !(fProcessors.xferProcessor() && fProcessors.xferProcessor()->xferBarrierType(caps)); - return analysis.requiresDstTexture() ? RequiresDstTexture::kYes : RequiresDstTexture::kNo; +} + +void GrAtlasTextOp::applyPipelineOptimizations(const PipelineOptimizations& optimizations) { + optimizations.getOverrideColorIfSet(&fGeoData[0].fColor); + + fColor = fGeoData[0].fColor; + fUsesLocalCoords = optimizations.readsLocalCoords(); } void GrAtlasTextOp::onPrepareDraws(Target* target) const { @@ -93,16 +88,15 @@ void GrAtlasTextOp::onPrepareDraws(Target* target) const { GrMaskFormat maskFormat = this->maskFormat(); FlushInfo flushInfo; - flushInfo.fPipeline = target->makePipeline(fSRGBFlags, &fProcessors); if (this->usesDistanceFields()) { flushInfo.fGeometryProcessor = this->setupDfProcessor(this->viewMatrix(), fLuminanceColor, this->color(), std::move(proxy)); } else { GrSamplerParams params(SkShader::kClamp_TileMode, GrSamplerParams::kNone_FilterMode); - flushInfo.fGeometryProcessor = - GrBitmapTextGeoProc::Make(this->color(), std::move(proxy), params, maskFormat, - localMatrix, this->usesLocalCoords()); + flushInfo.fGeometryProcessor = GrBitmapTextGeoProc::Make( + this->color(), std::move(proxy), params, + maskFormat, localMatrix, this->usesLocalCoords()); } flushInfo.fGlyphsToFlush = 0; @@ -151,18 +145,15 @@ void GrAtlasTextOp::flush(GrLegacyMeshDrawOp::Target* target, FlushInfo* flushIn mesh.setIndexedPatterned(flushInfo->fIndexBuffer.get(), kIndicesPerGlyph, kVerticesPerGlyph, flushInfo->fGlyphsToFlush, maxGlyphsPerDraw); mesh.setVertexData(flushInfo->fVertexBuffer.get(), flushInfo->fVertexOffset); - target->draw(flushInfo->fGeometryProcessor.get(), flushInfo->fPipeline, mesh); + target->draw(flushInfo->fGeometryProcessor.get(), this->pipeline(), mesh); flushInfo->fVertexOffset += kVerticesPerGlyph * flushInfo->fGlyphsToFlush; flushInfo->fGlyphsToFlush = 0; } bool GrAtlasTextOp::onCombineIfPossible(GrOp* t, const GrCaps& caps) { GrAtlasTextOp* that = t->cast<GrAtlasTextOp>(); - if (fProcessors != that->fProcessors) { - return false; - } - - if (!fCanCombineOnTouchOrOverlap && GrRectsTouchOrOverlap(this->bounds(), that->bounds())) { + if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(), + that->bounds(), caps)) { return false; } @@ -248,8 +239,9 @@ sk_sp<GrGeometryProcessor> GrAtlasTextOp::setupDfProcessor(const SkMatrix& viewM GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make( redCorrection, greenCorrection, blueCorrection); - return GrDistanceFieldLCDTextGeoProc::Make(color, viewMatrix, std::move(proxy), params, - widthAdjust, flags, this->usesLocalCoords()); + return GrDistanceFieldLCDTextGeoProc::Make(color, viewMatrix, std::move(proxy), + params, widthAdjust, flags, + this->usesLocalCoords()); } else { #ifdef SK_GAMMA_APPLY_TO_A8 float correction = 0; @@ -258,8 +250,10 @@ sk_sp<GrGeometryProcessor> GrAtlasTextOp::setupDfProcessor(const SkMatrix& viewM correction = fDistanceAdjustTable->getAdjustment(lum >> kDistanceAdjustLumShift, fUseGammaCorrectDistanceTable); } - return GrDistanceFieldA8TextGeoProc::Make(color, viewMatrix, std::move(proxy), params, - correction, flags, this->usesLocalCoords()); + return GrDistanceFieldA8TextGeoProc::Make(color, + viewMatrix, std::move(proxy), + params, correction, flags, + this->usesLocalCoords()); #else return GrDistanceFieldA8TextGeoProc::Make(color, viewMatrix, std::move(proxy), |