From e3e9628ecf863f433f26bf6107d6a39ced57fe30 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Sun, 16 Jul 2017 00:40:10 +0000 Subject: Revert "Make GrAtlasTextOp a non-legacy GrMeshDrawOp" This reverts commit 434a58ab5fefcc1b86588c7fce898b1e5bd248ba. Reason for revert: Original change's description: > Make GrAtlasTextOp a non-legacy GrMeshDrawOp > > Change-Id: Ib9eaf149100b0ccecf1c18a755263f2579b8e6f6 > Reviewed-on: https://skia-review.googlesource.com/23482 > Reviewed-by: Jim Van Verth > Commit-Queue: Brian Salomon TBR=jvanverth@google.com,bsalomon@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I7fd8503b4e0c297b2cfaf979545354aa58d1f989 Reviewed-on: https://skia-review.googlesource.com/23760 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- src/gpu/GrDrawOpTest.h | 5 ++- src/gpu/GrProcessorSet.h | 1 - src/gpu/ops/GrAtlasTextOp.cpp | 64 +++++++++++++++++-------------------- src/gpu/ops/GrAtlasTextOp.h | 47 ++++++++++++--------------- src/gpu/text/GrAtlasTextBlob.cpp | 38 +++++++++++----------- src/gpu/text/GrAtlasTextBlob.h | 20 ++++++------ src/gpu/text/GrAtlasTextContext.cpp | 14 +++----- src/gpu/text/GrAtlasTextContext.h | 2 +- tools/gpu/GrTest.cpp | 4 +-- 9 files changed, 86 insertions(+), 109 deletions(-) diff --git a/src/gpu/GrDrawOpTest.h b/src/gpu/GrDrawOpTest.h index b77fe48bf7..a30ca2801f 100644 --- a/src/gpu/GrDrawOpTest.h +++ b/src/gpu/GrDrawOpTest.h @@ -27,13 +27,12 @@ void GrDrawRandomOp(SkRandom*, GrRenderTargetContext*, GrPaint&&); #define GR_DRAW_OP_TEST_DEFINE(Op) \ std::unique_ptr Op##__Test(GrPaint&& paint, SkRandom* random, GrContext* context, \ GrFSAAType fsaaType) -#define GR_DRAW_OP_TEST_FRIEND(Op) \ - friend std::unique_ptr Op##__Test(GrPaint&& paint, SkRandom* random, \ - GrContext* context, GrFSAAType fsaaType) /** Variations for GrLegacyMeshDrawOps. To be deleted. */ #define GR_LEGACY_MESH_DRAW_OP_TEST_DEFINE(Op) \ std::unique_ptr Op##__Test(SkRandom* random, GrContext* context) +#define GR_LEGACY_MESH_DRAW_OP_TEST_FRIEND(Op) \ + friend std::unique_ptr Op##__Test(SkRandom* random, GrContext* context); /** Helper for op test factories to pick a random stencil state. */ const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext*); diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h index e3fe4c64b2..666e1c332b 100644 --- a/src/gpu/GrProcessorSet.h +++ b/src/gpu/GrProcessorSet.h @@ -134,7 +134,6 @@ public: bool isFinalized() const { return SkToBool(kFinalized_Flag & fFlags); } - /** These are valid only for non-LCD coverage. */ static const GrProcessorSet& EmptySet(); static constexpr const Analysis EmptySetAnalysis() { return Analysis(Empty::kEmpty); } 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(); - 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 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 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), diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h index 449f1fa0ab..24166a19d9 100644 --- a/src/gpu/ops/GrAtlasTextOp.h +++ b/src/gpu/ops/GrAtlasTextOp.h @@ -9,10 +9,11 @@ #define GrAtlasTextOp_DEFINED #include "ops/GrMeshDrawOp.h" + #include "text/GrAtlasTextContext.h" #include "text/GrDistanceFieldAdjustTable.h" -class GrAtlasTextOp final : public GrMeshDrawOp { +class GrAtlasTextOp final : public GrLegacyMeshDrawOp { public: DEFINE_OP_CLASS_ID @@ -36,9 +37,9 @@ public: GrColor fColor; }; - static std::unique_ptr MakeBitmap(GrPaint&& paint, GrMaskFormat maskFormat, - int glyphCount, GrAtlasGlyphCache* fontCache) { - std::unique_ptr op(new GrAtlasTextOp(std::move(paint))); + static std::unique_ptr MakeBitmap(GrMaskFormat maskFormat, int glyphCount, + GrAtlasGlyphCache* fontCache) { + std::unique_ptr op(new GrAtlasTextOp); op->fFontCache = fontCache; switch (maskFormat) { @@ -60,11 +61,11 @@ public: } static std::unique_ptr MakeDistanceField( - GrPaint&& paint, int glyphCount, GrAtlasGlyphCache* fontCache, + int glyphCount, GrAtlasGlyphCache* fontCache, const GrDistanceFieldAdjustTable* distanceAdjustTable, bool useGammaCorrectDistanceTable, SkColor luminanceColor, bool isLCD, bool useBGR, bool isAntiAliased) { - std::unique_ptr op(new GrAtlasTextOp(std::move(paint))); + std::unique_ptr op(new GrAtlasTextOp); op->fFontCache = fontCache; op->fMaskType = !isAntiAliased ? kAliasedDistanceField_MaskType @@ -99,28 +100,23 @@ public: SkString dumpInfo() const override; - FixedFunctionFlags fixedFunctionFlags() const override; - - RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override; - private: - GrAtlasTextOp(GrPaint&& paint) - : INHERITED(ClassID()) - , fColor(paint.getColor()) - , fSRGBFlags(GrPipeline::SRGBFlagsFromPaint(paint)) - , fProcessors(std::move(paint)) {} + void getProcessorAnalysisInputs(GrProcessorAnalysisColor*, + GrProcessorAnalysisCoverage*) const override; + void applyPipelineOptimizations(const PipelineOptimizations&) override; struct FlushInfo { sk_sp fVertexBuffer; sk_sp fIndexBuffer; sk_sp fGeometryProcessor; - const GrPipeline* fPipeline; int fGlyphsToFlush; int fVertexOffset; }; void onPrepareDraws(Target* target) const override; + GrAtlasTextOp() : INHERITED(ClassID()) {} // initialized in factory functions. + GrMaskFormat maskFormat() const { switch (fMaskType) { case kLCDCoverageMask_MaskType: @@ -163,9 +159,14 @@ private: sk_sp setupDfProcessor(const SkMatrix& viewMatrix, SkColor luminanceColor, GrColor color, sk_sp proxy) const; + GrColor fColor; + bool fUsesLocalCoords; + int fNumGlyphs; // The minimum number of Geometry we will try to allocate. enum { kMinGeometryAllocated = 4 }; + SkAutoSTMalloc fGeoData; + int fGeoCount; enum MaskType { kGrayscaleCoverageMask_MaskType, @@ -175,18 +176,10 @@ private: kGrayscaleDistanceField_MaskType, kLCDDistanceField_MaskType, kLCDBGRDistanceField_MaskType, - }; + } fMaskType; - SkAutoSTMalloc fGeoData; - GrColor fColor; - uint32_t fSRGBFlags; - GrProcessorSet fProcessors; - bool fUsesLocalCoords; - bool fCanCombineOnTouchOrOverlap; - int fGeoCount; - int fNumGlyphs; - MaskType fMaskType; GrAtlasGlyphCache* fFontCache; + // Distance field properties sk_sp fDistanceAdjustTable; SkColor fLuminanceColor; @@ -194,7 +187,7 @@ private: friend class GrBlobRegenHelper; // Needs to trigger flushes - typedef GrMeshDrawOp INHERITED; + typedef GrLegacyMeshDrawOp INHERITED; }; /* diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index 835105b4d2..10b1c81639 100644 --- a/src/gpu/text/GrAtlasTextBlob.cpp +++ b/src/gpu/text/GrAtlasTextBlob.cpp @@ -257,26 +257,22 @@ bool GrAtlasTextBlob::mustRegenerate(const GrTextUtils::Paint& paint, return false; } -inline std::unique_ptr GrAtlasTextBlob::makeOp( +inline std::unique_ptr GrAtlasTextBlob::makeOp( const Run::SubRunInfo& info, int glyphCount, int run, int subRun, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const GrTextUtils::Paint& paint, const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable, - GrAtlasGlyphCache* cache, GrRenderTargetContext* renderTargetContext) { + bool useGammaCorrectDistanceTable, GrAtlasGlyphCache* cache) { GrMaskFormat format = info.maskFormat(); - GrPaint grPaint; - if (!paint.toGrPaint(info.maskFormat(), renderTargetContext, viewMatrix, &grPaint)) { - return nullptr; - } std::unique_ptr op; if (info.drawAsDistanceFields()) { + SkColor luminanceColor = paint.luminanceColor(); bool useBGR = SkPixelGeometryIsBGR(props.pixelGeometry()); - op = GrAtlasTextOp::MakeDistanceField( - std::move(grPaint), glyphCount, cache, distanceAdjustTable, - renderTargetContext->isGammaCorrect(), paint.luminanceColor(), info.hasUseLCDText(), - useBGR, info.isAntiAliased()); + op = GrAtlasTextOp::MakeDistanceField(glyphCount, cache, distanceAdjustTable, + useGammaCorrectDistanceTable, luminanceColor, + info.hasUseLCDText(), useBGR, info.isAntiAliased()); } else { - op = GrAtlasTextOp::MakeBitmap(std::move(grPaint), format, glyphCount, cache); + op = GrAtlasTextOp::MakeBitmap(format, glyphCount, cache); } GrAtlasTextOp::Geometry& geometry = op->geometry(); geometry.fViewMatrix = viewMatrix; @@ -288,6 +284,7 @@ inline std::unique_ptr GrAtlasTextBlob::makeOp( geometry.fX = x; geometry.fY = y; op->init(); + return std::move(op); } @@ -307,11 +304,13 @@ inline void GrAtlasTextBlob::flushRun(GrRenderTargetContext* rtc, const GrClip& if (0 == glyphCount) { continue; } - auto op = this->makeOp(info, glyphCount, run, subRun, viewMatrix, x, y, std::move(paint), - props, distanceAdjustTable, cache, rtc); - if (op) { - rtc->addDrawOp(clip, std::move(op)); - } + + std::unique_ptr op( + this->makeOp(info, glyphCount, run, subRun, viewMatrix, x, y, paint, props, + distanceAdjustTable, rtc->isGammaCorrect(), cache)); + GrPipelineBuilder pipelineBuilder(std::move(grPaint), GrAAType::kNone); + + rtc->addLegacyMeshDrawOp(std::move(pipelineBuilder), clip, std::move(op)); } } @@ -426,14 +425,13 @@ void GrAtlasTextBlob::flushThrowaway(GrContext* context, GrRenderTargetContext* this->flushBigGlyphs(context, rtc, clip, paint, viewMatrix, x, y, clipBounds); } -std::unique_ptr GrAtlasTextBlob::test_makeOp( +std::unique_ptr GrAtlasTextBlob::test_makeOp( int glyphCount, int run, int subRun, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const GrTextUtils::Paint& paint, const SkSurfaceProps& props, - const GrDistanceFieldAdjustTable* distanceAdjustTable, GrAtlasGlyphCache* cache, - GrRenderTargetContext* rtc) { + const GrDistanceFieldAdjustTable* distanceAdjustTable, GrAtlasGlyphCache* cache) { const GrAtlasTextBlob::Run::SubRunInfo& info = fRuns[run].fSubRunInfo[subRun]; return this->makeOp(info, glyphCount, run, subRun, viewMatrix, x, y, paint, props, - distanceAdjustTable, cache, rtc); + distanceAdjustTable, false, cache); } void GrAtlasTextBlob::AssertEqual(const GrAtlasTextBlob& l, const GrAtlasTextBlob& r) { diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index 1bce3414da..12fe68b948 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -271,11 +271,10 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////// // Internal test methods - std::unique_ptr test_makeOp(int glyphCount, int run, int subRun, - const SkMatrix& viewMatrix, SkScalar x, SkScalar y, - const GrTextUtils::Paint&, const SkSurfaceProps&, - const GrDistanceFieldAdjustTable*, GrAtlasGlyphCache*, - GrRenderTargetContext*); + std::unique_ptr test_makeOp( + int glyphCount, int run, int subRun, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, + const GrTextUtils::Paint& paint, const SkSurfaceProps& props, + const GrDistanceFieldAdjustTable* distanceAdjustTable, GrAtlasGlyphCache* cache); private: GrAtlasTextBlob() @@ -498,12 +497,11 @@ private: Run* run, Run::SubRunInfo* info, SkAutoGlyphCache*, int glyphCount, size_t vertexStride, GrColor color, SkScalar transX, SkScalar transY) const; - inline std::unique_ptr makeOp(const Run::SubRunInfo& info, int glyphCount, int run, - int subRun, const SkMatrix& viewMatrix, SkScalar x, - SkScalar y, const GrTextUtils::Paint& paint, - const SkSurfaceProps& props, - const GrDistanceFieldAdjustTable* distanceAdjustTable, - GrAtlasGlyphCache* cache, GrRenderTargetContext*); + inline std::unique_ptr makeOp( + const Run::SubRunInfo& info, int glyphCount, int run, int subRun, + const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const GrTextUtils::Paint& paint, + const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable, + bool useGammaCorrectDistanceTable, GrAtlasGlyphCache* cache); struct BigGlyph { BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool treatAsBMP) diff --git a/src/gpu/text/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp index 22228ed2b6..71c410eab7 100644 --- a/src/gpu/text/GrAtlasTextContext.cpp +++ b/src/gpu/text/GrAtlasTextContext.cpp @@ -339,7 +339,7 @@ void GrAtlasTextContext::drawPosText(GrContext* context, GrRenderTargetContext* #if GR_TEST_UTILS -GR_DRAW_OP_TEST_DEFINE(GrAtlasTextOp) { +GR_LEGACY_MESH_DRAW_OP_TEST_DEFINE(TextBlobOp) { static uint32_t gContextID = SK_InvalidGenID; static GrAtlasTextContext* gTextContext = nullptr; static SkSurfaceProps gSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType); @@ -356,15 +356,11 @@ GR_DRAW_OP_TEST_DEFINE(GrAtlasTextOp) { SkBackingFit::kApprox, 1024, 1024, kRGBA_8888_GrPixelConfig, nullptr)); SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random); - - // Because we the GrTextUtils::Paint requires an SkPaint for font info, we ignore the GrPaint - // param. SkPaint skPaint; skPaint.setColor(random->nextU()); skPaint.setLCDRenderText(random->nextBool()); skPaint.setAntiAlias(skPaint.isLCDRenderText() ? true : random->nextBool()); skPaint.setSubpixelText(random->nextBool()); - GrTextUtils::Paint utilsPaint(&skPaint, rtc->getColorSpace(), rtc->getColorXformFromSRGB()); const char* text = "The quick brown fox jumps over the lazy dog."; int textLen = (int)strlen(text); @@ -378,17 +374,17 @@ GR_DRAW_OP_TEST_DEFINE(GrAtlasTextOp) { SkScalar x = SkIntToScalar(xInt); SkScalar y = SkIntToScalar(yInt); + GrTextUtils::Paint paint(&skPaint, rtc->getColorSpace(), rtc->getColorXformFromSRGB()); // right now we don't handle textblobs, nor do we handle drawPosText. Since we only intend to // test the text op with this unit test, that is okay. sk_sp blob(GrAtlasTextContext::MakeDrawTextBlob( context->getTextBlobCache(), context->getAtlasGlyphCache(), - *context->caps()->shaderCaps(), utilsPaint, + *context->caps()->shaderCaps(), paint, GrAtlasTextContext::kTextBlobOpScalerContextFlags, viewMatrix, gSurfaceProps, text, static_cast(textLen), x, y)); - return blob->test_makeOp(textLen, 0, 0, viewMatrix, x, y, utilsPaint, gSurfaceProps, - gTextContext->dfAdjustTable(), context->getAtlasGlyphCache(), - rtc.get()); + return blob->test_makeOp(textLen, 0, 0, viewMatrix, x, y, paint, gSurfaceProps, + gTextContext->dfAdjustTable(), context->getAtlasGlyphCache()); } #endif diff --git a/src/gpu/text/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h index c47ec65666..e375195cde 100644 --- a/src/gpu/text/GrAtlasTextContext.h +++ b/src/gpu/text/GrAtlasTextContext.h @@ -89,7 +89,7 @@ private: #if GR_TEST_UTILS static const uint32_t kTextBlobOpScalerContextFlags = SkPaint::kFakeGammaAndBoostContrast_ScalerContextFlags; - GR_DRAW_OP_TEST_FRIEND(GrAtlasTextOp); + GR_LEGACY_MESH_DRAW_OP_TEST_FRIEND(TextBlobOp); #endif }; diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 0265f6ef3d..727c16990b 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -314,6 +314,7 @@ void GrDrawingManager::testingOnly_removeOnFlushCallbackObject(GrOnFlushCallback #define DRAW_OP_TEST_ENTRY(Op) Op##__Test LEGACY_MESH_DRAW_OP_TEST_EXTERN(AnalyticRectOp); +LEGACY_MESH_DRAW_OP_TEST_EXTERN(TextBlobOp); DRAW_OP_TEST_EXTERN(AAConvexPathOp); DRAW_OP_TEST_EXTERN(AAFillRectOp); @@ -325,7 +326,6 @@ DRAW_OP_TEST_EXTERN(DashOp); DRAW_OP_TEST_EXTERN(DefaultPathOp); DRAW_OP_TEST_EXTERN(DIEllipseOp); DRAW_OP_TEST_EXTERN(EllipseOp); -DRAW_OP_TEST_EXTERN(GrAtlasTextOp); DRAW_OP_TEST_EXTERN(GrDrawAtlasOp); DRAW_OP_TEST_EXTERN(GrDrawVerticesOp); DRAW_OP_TEST_EXTERN(NonAAFillRectOp); @@ -342,6 +342,7 @@ void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext using MakeTestLegacyMeshDrawOpFn = std::unique_ptr(SkRandom*, GrContext*); static constexpr MakeTestLegacyMeshDrawOpFn* gLegacyFactories[] = { DRAW_OP_TEST_ENTRY(AnalyticRectOp), + DRAW_OP_TEST_ENTRY(TextBlobOp), }; using MakeDrawOpFn = std::unique_ptr(GrPaint&&, SkRandom*, GrContext*, GrFSAAType); @@ -356,7 +357,6 @@ void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext DRAW_OP_TEST_ENTRY(DefaultPathOp), DRAW_OP_TEST_ENTRY(DIEllipseOp), DRAW_OP_TEST_ENTRY(EllipseOp), - DRAW_OP_TEST_ENTRY(GrAtlasTextOp), DRAW_OP_TEST_ENTRY(GrDrawAtlasOp), DRAW_OP_TEST_ENTRY(GrDrawVerticesOp), DRAW_OP_TEST_ENTRY(NonAAFillRectOp), -- cgit v1.2.3