From 434a58ab5fefcc1b86588c7fce898b1e5bd248ba Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 14 Jul 2017 15:14:59 -0400 Subject: Make GrAtlasTextOp a non-legacy GrMeshDrawOp Change-Id: Ib9eaf149100b0ccecf1c18a755263f2579b8e6f6 Reviewed-on: https://skia-review.googlesource.com/23482 Reviewed-by: Jim Van Verth Commit-Queue: Brian Salomon --- src/gpu/GrDrawOpTest.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gpu/GrDrawOpTest.h') 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 Op##__Test(GrPaint&& paint, SkRandom* random, GrContext* context, \ GrFSAAType fsaaType) +#define GR_DRAW_OP_TEST_FRIEND(Op) \ + friend std::unique_ptr 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 Op##__Test(SkRandom* random, GrContext* context) -#define GR_LEGACY_MESH_DRAW_OP_TEST_FRIEND(Op) \ - friend std::unique_ptr Op##__Test(SkRandom* random, GrContext* context); /** Helper for op test factories to pick a random stencil state. */ const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext*); -- cgit v1.2.3