From b295573c93e7a9a78ee736a399c256d7669b79be Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 13 Jul 2017 16:42:55 -0400 Subject: Move GrAALinearizingConvexPathRenderer off GrLegacyMeshDrawOp Change-Id: I7d3c4053d4a833215371d77de683964cef317a5c Reviewed-on: https://skia-review.googlesource.com/20460 Reviewed-by: Brian Osman Commit-Queue: Brian Salomon --- tools/gpu/GrTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/gpu/GrTest.cpp') diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index c78507253a..727c16990b 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -313,12 +313,12 @@ void GrDrawingManager::testingOnly_removeOnFlushCallbackObject(GrOnFlushCallback #define DRAW_OP_TEST_ENTRY(Op) Op##__Test -LEGACY_MESH_DRAW_OP_TEST_EXTERN(AAFlatteningConvexPathOp); LEGACY_MESH_DRAW_OP_TEST_EXTERN(AnalyticRectOp); LEGACY_MESH_DRAW_OP_TEST_EXTERN(TextBlobOp); DRAW_OP_TEST_EXTERN(AAConvexPathOp); DRAW_OP_TEST_EXTERN(AAFillRectOp); +DRAW_OP_TEST_EXTERN(AAFlatteningConvexPathOp); DRAW_OP_TEST_EXTERN(AAHairlineOp); DRAW_OP_TEST_EXTERN(AAStrokeRectOp); DRAW_OP_TEST_EXTERN(CircleOp); @@ -341,7 +341,6 @@ void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext GrContext* context = renderTargetContext->surfPriv().getContext(); using MakeTestLegacyMeshDrawOpFn = std::unique_ptr(SkRandom*, GrContext*); static constexpr MakeTestLegacyMeshDrawOpFn* gLegacyFactories[] = { - DRAW_OP_TEST_ENTRY(AAFlatteningConvexPathOp), DRAW_OP_TEST_ENTRY(AnalyticRectOp), DRAW_OP_TEST_ENTRY(TextBlobOp), }; @@ -350,6 +349,7 @@ void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext static constexpr MakeDrawOpFn* gFactories[] = { DRAW_OP_TEST_ENTRY(AAConvexPathOp), DRAW_OP_TEST_ENTRY(AAFillRectOp), + DRAW_OP_TEST_ENTRY(AAFlatteningConvexPathOp), DRAW_OP_TEST_ENTRY(AAHairlineOp), DRAW_OP_TEST_ENTRY(AAStrokeRectOp), DRAW_OP_TEST_ENTRY(CircleOp), -- cgit v1.2.3