From 649a3411f99a8aea3c46e4ef1f495f61b9801164 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 9 Mar 2017 13:50:43 -0500 Subject: Add a separate draw function to GrRenderTargetContext for GrMeshDrawOp derived classes. The first phase of deferring GrPipeline creation until flush will apply only to GrDrawOp subclasses that do not derive from GrMeshDrawOp. This change prepares for that by creating separate draw functions on GrRenderTargetContext for GrMeshDrawOp-derived ops. This is temporary and will incrementally be undone as pipeline-creation deferral rolls out to the GrMeshDrawOps in a later phase of this work. Change-Id: I0f5b71fe913f3273cfe9e965f7d8bbe7f01ad0ef Reviewed-on: https://skia-review.googlesource.com/9481 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- src/gpu/GrDrawOpTest.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gpu/GrDrawOpTest.h') diff --git a/src/gpu/GrDrawOpTest.h b/src/gpu/GrDrawOpTest.h index 8c98597c3f..43bd21a59e 100644 --- a/src/gpu/GrDrawOpTest.h +++ b/src/gpu/GrDrawOpTest.h @@ -13,20 +13,20 @@ #if GR_TEST_UTILS -class GrDrawOp; class GrContext; +class GrMeshDrawOp; class SkRandom; /** This function returns a randomly configured GrDrawOp for testing purposes. */ -std::unique_ptr GrRandomDrawOp(SkRandom*, GrContext*); +std::unique_ptr GrRandomDrawOp(SkRandom*, GrContext*); /** GrDrawOp subclasses should define test factory functions using this macro. */ #define DRAW_OP_TEST_DEFINE(Op) \ - std::unique_ptr Op##__Test(SkRandom* random, GrContext* context) + std::unique_ptr Op##__Test(SkRandom* random, GrContext* context) /** This macro may be used if the test factory function must be made a friend of a class. */ #define DRAW_OP_TEST_FRIEND(Op) \ - friend std::unique_ptr Op##__Test(SkRandom* random, GrContext* context); + friend std::unique_ptr Op##__Test(SkRandom* random, GrContext* context); #endif #endif -- cgit v1.2.3