diff options
| author | bsalomon <bsalomon@google.com> | 2014-11-03 13:32:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-03 13:32:00 -0800 |
| commit | 0537f290c5181d3a6a64cd07d5fbb3cd40f35a13 (patch) | |
| tree | 09042ba759c2798bc207525a8387d2abbce15ae4 /src/gpu/GrContext.cpp | |
| parent | d239d425148e5c1445b6a99d9bc33348c41197bc (diff) | |
| download | skia-0537f290c5181d3a6a64cd07d5fbb3cd40f35a13.tar.gz | |
Revert changes to GrContext::resolveRenderTarget
TBR=joshualitt@google.com,egdaniel@google.com
Review URL: https://codereview.chromium.org/700483003
Diffstat (limited to 'src/gpu/GrContext.cpp')
| -rwxr-xr-x | src/gpu/GrContext.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 8c5abe783..9d684aa13 100755 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1537,12 +1537,7 @@ bool GrContext::readRenderTargetPixels(GrRenderTarget* target, void GrContext::resolveRenderTarget(GrRenderTarget* target) { SkASSERT(target); ASSERT_OWNED_RESOURCE(target); - if (!target->needsResolve()) { - return; - } - if (target->surfacePriv().hasPendingIO()) { - this->flush(); - } + this->flush(); if (fGpu) { fGpu->resolveRenderTarget(target); } |