From d3ccb0a37f0e62c84fdcd6a77b7b15476b04db7a Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 3 Apr 2017 10:38:00 -0400 Subject: Move pipeline handling out of GrMeshDrawOp. The monolithic GrPipeline is moved to a subclass GrLegacyDrawMeshOp. The pipeline used to record a GrMesh draw in a GrMeshDrawOp must now be passed rather than implicitly using the op's pipeline. Change-Id: I50d77e4dcc8d91a523fa7566ce43a9a291174706 Reviewed-on: https://skia-review.googlesource.com/11002 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- gm/rrects.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gm/rrects.cpp') diff --git a/gm/rrects.cpp b/gm/rrects.cpp index ac66d521cb..8219681b14 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -115,9 +115,9 @@ protected: SkRect bounds = rrect.getBounds(); bounds.outset(2.f, 2.f); - std::unique_ptr op(GrRectOpFactory::MakeNonAAFill( + std::unique_ptr op(GrRectOpFactory::MakeNonAAFill( 0xff000000, SkMatrix::I(), bounds, nullptr, nullptr)); - renderTargetContext->priv().testingOnly_addMeshDrawOp( + renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( std::move(grPaint), GrAAType::kNone, std::move(op)); } else { drew = false; -- cgit v1.2.3