diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-08-18 09:16:57 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-18 14:37:09 +0000 |
| commit | 20af6d12eefd8d937bc13bdb7fa0a9ac86b699af (patch) | |
| tree | 6773b3029cb9c426c5e3daaed28b1f4e34740e4d /tools/gpu | |
| parent | f6df1cd993c4cd717b40c5f19c2b96029250ac9b (diff) | |
Revert "Revert "Add GrTextureOp and use to implement SkGpuDevice::drawImage[Rect]() when possible""
This reverts commit ceef4fb5c498003be77a32a46cedfbf5da22a274.
Bug: skia:
Change-Id: I50b738169b4cf9e06cbe0b5fad0234b506717b66
Reviewed-on: https://skia-review.googlesource.com/36201
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools/gpu')
| -rw-r--r-- | tools/gpu/GrTest.cpp | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index c5af01e0df..57ff77e5e7 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -316,32 +316,34 @@ DRAW_OP_TEST_EXTERN(SmallPathOp); DRAW_OP_TEST_EXTERN(RegionOp); DRAW_OP_TEST_EXTERN(RRectOp); DRAW_OP_TEST_EXTERN(TesselatingPathOp); +DRAW_OP_TEST_EXTERN(TextureOp); void GrDrawRandomOp(SkRandom* random, GrRenderTargetContext* renderTargetContext, GrPaint&& paint) { GrContext* context = renderTargetContext->surfPriv().getContext(); using MakeDrawOpFn = std::unique_ptr<GrDrawOp>(GrPaint&&, SkRandom*, GrContext*, GrFSAAType); 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), - DRAW_OP_TEST_ENTRY(DashOp), - 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), - DRAW_OP_TEST_ENTRY(NonAALatticeOp), - DRAW_OP_TEST_ENTRY(NonAAStrokeRectOp), - DRAW_OP_TEST_ENTRY(ShadowRRectOp), - DRAW_OP_TEST_ENTRY(SmallPathOp), - DRAW_OP_TEST_ENTRY(RegionOp), - DRAW_OP_TEST_ENTRY(RRectOp), - DRAW_OP_TEST_ENTRY(TesselatingPathOp), + 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), + DRAW_OP_TEST_ENTRY(DashOp), + 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), + DRAW_OP_TEST_ENTRY(NonAALatticeOp), + DRAW_OP_TEST_ENTRY(NonAAStrokeRectOp), + DRAW_OP_TEST_ENTRY(ShadowRRectOp), + DRAW_OP_TEST_ENTRY(SmallPathOp), + DRAW_OP_TEST_ENTRY(RegionOp), + DRAW_OP_TEST_ENTRY(RRectOp), + DRAW_OP_TEST_ENTRY(TesselatingPathOp), + DRAW_OP_TEST_ENTRY(TextureOp), }; static constexpr size_t kTotal = SK_ARRAY_COUNT(gFactories); |