diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-14 15:14:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-14 20:24:15 +0000 |
| commit | 434a58ab5fefcc1b86588c7fce898b1e5bd248ba (patch) | |
| tree | 333d79988ad13f6ffebc49ab93d63c3900af1ae9 /tools | |
| parent | 420f1565e9783b25d6ceb7ada21ca7c7c57d9e4c (diff) | |
Make GrAtlasTextOp a non-legacy GrMeshDrawOp
Change-Id: Ib9eaf149100b0ccecf1c18a755263f2579b8e6f6
Reviewed-on: https://skia-review.googlesource.com/23482
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpu/GrTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 727c16990b..0265f6ef3d 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -314,7 +314,6 @@ 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); @@ -326,6 +325,7 @@ 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,7 +342,6 @@ void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext using MakeTestLegacyMeshDrawOpFn = std::unique_ptr<GrLegacyMeshDrawOp>(SkRandom*, GrContext*); static constexpr MakeTestLegacyMeshDrawOpFn* gLegacyFactories[] = { DRAW_OP_TEST_ENTRY(AnalyticRectOp), - DRAW_OP_TEST_ENTRY(TextBlobOp), }; using MakeDrawOpFn = std::unique_ptr<GrDrawOp>(GrPaint&&, SkRandom*, GrContext*, GrFSAAType); @@ -357,6 +356,7 @@ 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), |