From 96c118edff293af93db0a2b1b6775428117924b1 Mon Sep 17 00:00:00 2001 From: junov Date: Fri, 26 Sep 2014 13:09:47 -0700 Subject: Change GrContext::copyTexture to go through GrDrawTarget BUG=crbug.com/415100 R=bsalomon@google.com, robertphillips@google.com Author: junov@chromium.org Review URL: https://codereview.chromium.org/607993002 --- src/gpu/GrContext.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'src/gpu/GrContext.cpp') diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 42b884bcac..ad1b4c4955 100755 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1576,16 +1576,6 @@ void GrContext::copyTexture(GrTexture* src, GrRenderTarget* dst, const SkIPoint* } ASSERT_OWNED_RESOURCE(src); - - if (src->hasPendingWrite() || dst->hasPendingIO()) { - this->flush(); - } - - GrDrawTarget::AutoStateRestore asr(fGpu, GrDrawTarget::kReset_ASRInit); - GrDrawState* drawState = fGpu->drawState(); - drawState->setRenderTarget(dst); - SkMatrix sampleM; - sampleM.setIDiv(src->width(), src->height()); SkIRect srcRect = SkIRect::MakeWH(dst->width(), dst->height()); if (topLeft) { srcRect.offset(*topLeft); @@ -1594,10 +1584,14 @@ void GrContext::copyTexture(GrTexture* src, GrRenderTarget* dst, const SkIPoint* if (!srcRect.intersect(srcBounds)) { return; } - sampleM.preTranslate(SkIntToScalar(srcRect.fLeft), SkIntToScalar(srcRect.fTop)); - drawState->addColorTextureProcessor(src, sampleM); - SkRect dstR = SkRect::MakeWH(SkIntToScalar(srcRect.width()), SkIntToScalar(srcRect.height())); - fGpu->drawSimpleRect(dstR); + + GrDrawTarget* target = this->prepareToDraw(NULL, BUFFERED_DRAW, NULL, NULL); + if (NULL == target) { + return; + } + SkIPoint dstPoint; + dstPoint.setZero(); + target->copySurface(dst, src, srcRect, dstPoint); } bool GrContext::writeRenderTargetPixels(GrRenderTarget* target, -- cgit v1.2.3