diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-11 08:52:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-11 13:39:21 +0000 |
| commit | 815486c42f1ca66c81e12d8ccc9fb142e3c10544 (patch) | |
| tree | 56a3b7633ac476463c5f185e614e1e94e9685ffa /tools | |
| parent | 8e8c755f56e5dbaf0f87d88a775632010b32e974 (diff) | |
Convert NonAALatticeOp to non-legacy GrMeshDrawOp.
Also adds a test factory and fixes a bug in the lattice iter validator where it compared each div value against the start rather than the previous div.
Bug: skia:
Change-Id: I30e9ddfcbaab7829a2f646ad851f99d1e518ab4a
Reviewed-on: https://skia-review.googlesource.com/21871
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpu/GrTest.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index ec8af81f94..61f3d82c33 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -306,14 +306,14 @@ void GrDrawingManager::testingOnly_removeOnFlushCallbackObject(GrOnFlushCallback ////////////////////////////////////////////////////////////////////////////// #define DRAW_OP_TEST_EXTERN(Op) \ - extern std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&&, SkRandom*, GrContext*, GrFSAAType); + extern std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&&, SkRandom*, GrContext*, GrFSAAType) #define LEGACY_MESH_DRAW_OP_TEST_EXTERN(Op) \ - extern std::unique_ptr<GrLegacyMeshDrawOp> Op##__Test(SkRandom*, GrContext*); + extern std::unique_ptr<GrLegacyMeshDrawOp> Op##__Test(SkRandom*, GrContext*) #define DRAW_OP_TEST_ENTRY(Op) Op##__Test -LEGACY_MESH_DRAW_OP_TEST_EXTERN(AAFlatteningConvexPathOp) +LEGACY_MESH_DRAW_OP_TEST_EXTERN(AAFlatteningConvexPathOp); LEGACY_MESH_DRAW_OP_TEST_EXTERN(AnalyticRectOp); LEGACY_MESH_DRAW_OP_TEST_EXTERN(DashOp); LEGACY_MESH_DRAW_OP_TEST_EXTERN(DefaultPathOp); @@ -324,13 +324,14 @@ LEGACY_MESH_DRAW_OP_TEST_EXTERN(TextBlobOp); LEGACY_MESH_DRAW_OP_TEST_EXTERN(VerticesOp); DRAW_OP_TEST_EXTERN(AAConvexPathOp); -DRAW_OP_TEST_EXTERN(AAFillRectOp) +DRAW_OP_TEST_EXTERN(AAFillRectOp); DRAW_OP_TEST_EXTERN(AAHairlineOp); DRAW_OP_TEST_EXTERN(AAStrokeRectOp); -DRAW_OP_TEST_EXTERN(CircleOp) +DRAW_OP_TEST_EXTERN(CircleOp); DRAW_OP_TEST_EXTERN(DIEllipseOp); DRAW_OP_TEST_EXTERN(EllipseOp); -DRAW_OP_TEST_EXTERN(NonAAFillRectOp) +DRAW_OP_TEST_EXTERN(NonAAFillRectOp); +DRAW_OP_TEST_EXTERN(NonAALatticeOp); DRAW_OP_TEST_EXTERN(NonAAStrokeRectOp); DRAW_OP_TEST_EXTERN(RRectOp); @@ -359,6 +360,7 @@ void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext DRAW_OP_TEST_ENTRY(DIEllipseOp), DRAW_OP_TEST_ENTRY(EllipseOp), DRAW_OP_TEST_ENTRY(NonAAFillRectOp), + DRAW_OP_TEST_ENTRY(NonAALatticeOp), DRAW_OP_TEST_ENTRY(NonAAStrokeRectOp), DRAW_OP_TEST_ENTRY(RRectOp), }; |