diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-18 19:59:24 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-19 12:17:34 +0000 |
| commit | 44acb5b09bb87163bc9c010be915b3f33e3157eb (patch) | |
| tree | a68b092d868c49ec1f686b4a4a862c61ece8d5c0 /src/gpu/GrDrawOpTest.h | |
| parent | 5af44defbd5fc7ef0053ec4b61f0859170f2fb15 (diff) | |
Revert "Revert "Make GrAtlasTextOp a non-legacy GrMeshDrawOp""
This reverts commit e3e9628ecf863f433f26bf6107d6a39ced57fe30.
Adds blendmode_mask_* benchs to blacklist for Chromecast.
Otherwise a clean revert of the revert.
Bug: skia:
Change-Id: I9f64ae55804fa4aad97c1785834281039570c56c
Reviewed-on: https://skia-review.googlesource.com/24409
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrDrawOpTest.h')
| -rw-r--r-- | src/gpu/GrDrawOpTest.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/GrDrawOpTest.h b/src/gpu/GrDrawOpTest.h index a30ca2801f..b77fe48bf7 100644 --- a/src/gpu/GrDrawOpTest.h +++ b/src/gpu/GrDrawOpTest.h @@ -27,12 +27,13 @@ void GrDrawRandomOp(SkRandom*, GrRenderTargetContext*, GrPaint&&); #define GR_DRAW_OP_TEST_DEFINE(Op) \ std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, GrContext* context, \ GrFSAAType fsaaType) +#define GR_DRAW_OP_TEST_FRIEND(Op) \ + friend std::unique_ptr<GrDrawOp> Op##__Test(GrPaint&& paint, SkRandom* random, \ + GrContext* context, GrFSAAType fsaaType) /** Variations for GrLegacyMeshDrawOps. To be deleted. */ #define GR_LEGACY_MESH_DRAW_OP_TEST_DEFINE(Op) \ std::unique_ptr<GrLegacyMeshDrawOp> Op##__Test(SkRandom* random, GrContext* context) -#define GR_LEGACY_MESH_DRAW_OP_TEST_FRIEND(Op) \ - friend std::unique_ptr<GrLegacyMeshDrawOp> Op##__Test(SkRandom* random, GrContext* context); /** Helper for op test factories to pick a random stencil state. */ const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext*); |