Index: src/gpu/GrContext.cpp |
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp |
index 42b884bcac8d0c54240d95d87cdb9c281919980b..0d364d54b1e2170fff2f421672729ecdc11d4f36 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(); |
Justin Novosad
2014/09/26 18:48:23
Pretty sure this is no longer necessary now that w
bsalomon
2014/09/26 18:50:37
correct
|
- } |
- |
- 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,16 @@ 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); |
+ |
+ AutoRestoreEffects are; |
+ AutoCheckFlush acf(this); |
+ GrDrawTarget* target = this->prepareToDraw(NULL, BUFFERED_DRAW, &are, &acf); |
Justin Novosad
2014/09/26 18:48:23
This is just boilerplate stuff that I cargo-culted
|
+ if (NULL == target) { |
+ return; |
+ } |
+ SkIPoint dstPoint; |
+ dstPoint.setZero(); |
+ target->copySurface(dst, src, srcRect, dstPoint); |
} |
bool GrContext::writeRenderTargetPixels(GrRenderTarget* target, |