From fc26f3ca5f8f01b4ef47fd7ced4c589205e45ae8 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 14 Jul 2017 15:27:56 -0400 Subject: Remove GrAnalyticRectOp, the last legacy GrMeshDrawOp Change-Id: I2b8d1f4c1585af4a157d269a526874bccc74ac81 Reviewed-on: https://skia-review.googlesource.com/23484 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- tools/gpu/GrTest.cpp | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) (limited to 'tools') diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 0265f6ef3d..201476855d 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -307,14 +307,8 @@ void GrDrawingManager::testingOnly_removeOnFlushCallbackObject(GrOnFlushCallback #define DRAW_OP_TEST_EXTERN(Op) \ extern std::unique_ptr Op##__Test(GrPaint&&, SkRandom*, GrContext*, GrFSAAType) - -#define LEGACY_MESH_DRAW_OP_TEST_EXTERN(Op) \ - extern std::unique_ptr Op##__Test(SkRandom*, GrContext*) - #define DRAW_OP_TEST_ENTRY(Op) Op##__Test -LEGACY_MESH_DRAW_OP_TEST_EXTERN(AnalyticRectOp); - DRAW_OP_TEST_EXTERN(AAConvexPathOp); DRAW_OP_TEST_EXTERN(AAFillRectOp); DRAW_OP_TEST_EXTERN(AAFlatteningConvexPathOp); @@ -339,11 +333,6 @@ DRAW_OP_TEST_EXTERN(TesselatingPathOp); void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext, GrPaint&& paint) { GrContext* context = renderTargetContext->surfPriv().getContext(); - using MakeTestLegacyMeshDrawOpFn = std::unique_ptr(SkRandom*, GrContext*); - static constexpr MakeTestLegacyMeshDrawOpFn* gLegacyFactories[] = { - DRAW_OP_TEST_ENTRY(AnalyticRectOp), - }; - using MakeDrawOpFn = std::unique_ptr(GrPaint&&, SkRandom*, GrContext*, GrFSAAType); static constexpr MakeDrawOpFn* gFactories[] = { DRAW_OP_TEST_ENTRY(AAConvexPathOp), @@ -369,24 +358,10 @@ void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext DRAW_OP_TEST_ENTRY(TesselatingPathOp), }; - static constexpr size_t kTotal = SK_ARRAY_COUNT(gLegacyFactories) + SK_ARRAY_COUNT(gFactories); - + static constexpr size_t kTotal = SK_ARRAY_COUNT(gFactories); uint32_t index = random->nextULessThan(static_cast(kTotal)); - if (index < SK_ARRAY_COUNT(gLegacyFactories)) { - const GrUserStencilSettings* uss = GrGetRandomStencil(random, context); - // We don't use kHW because we will hit an assertion if the render target is not - // multisampled - static constexpr GrAAType kAATypes[] = {GrAAType::kNone, GrAAType::kCoverage}; - GrAAType aaType = kAATypes[random->nextULessThan(SK_ARRAY_COUNT(kAATypes))]; - bool snapToCenters = random->nextBool(); - auto op = gLegacyFactories[index](random, context); - SkASSERT(op); - renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( - std::move(paint), aaType, std::move(op), uss, snapToCenters); - } else { - auto op = gFactories[index - SK_ARRAY_COUNT(gLegacyFactories)]( - std::move(paint), random, context, renderTargetContext->fsaaType()); - SkASSERT(op); - renderTargetContext->priv().testingOnly_addDrawOp(std::move(op)); - } + auto op = gFactories[index]( + std::move(paint), random, context, renderTargetContext->fsaaType()); + SkASSERT(op); + renderTargetContext->priv().testingOnly_addDrawOp(std::move(op)); } -- cgit v1.2.3