From 2890fbfe1400b81e4d6af98d14dfe757fec93650 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 26 Jul 2017 15:48:41 -0400 Subject: Make GrPipeline hold a GrRenderTargetProxy (instead of a GrRenderTarget) In a future world where GrSurface no longer has an origin it will be useful for the GrPipeline to be holding the GrRenderTargetProxy (which will still have an origin). Change-Id: I743a8cc07b6b92f8116227fb77b7c37da43cde8a Reviewed-on: https://skia-review.googlesource.com/26804 Reviewed-by: Brian Salomon Commit-Queue: Robert Phillips --- src/gpu/instanced/InstancedOp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu/instanced/InstancedOp.cpp') diff --git a/src/gpu/instanced/InstancedOp.cpp b/src/gpu/instanced/InstancedOp.cpp index 9b80540fb2..ab2b7583c8 100644 --- a/src/gpu/instanced/InstancedOp.cpp +++ b/src/gpu/instanced/InstancedOp.cpp @@ -238,12 +238,12 @@ void InstancedOp::onExecute(GrOpFlushState* state) { if (fDisableSRGBOutputConversion) { args.fFlags |= GrPipeline::kDisableOutputConversionToSRGB_Flag; } - args.fRenderTarget = state->drawOpArgs().fRenderTarget; + args.fProxy = state->drawOpArgs().fProxy; args.fDstProxy = state->drawOpArgs().fDstProxy; pipeline.init(args); if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*state->gpu()->caps())) { - state->gpu()->xferBarrier(pipeline.getRenderTarget(), barrierType); + state->gpu()->xferBarrier(pipeline.renderTarget(), barrierType); } fInstancedRendering->draw(pipeline, fInfo, this); } -- cgit v1.2.3