commit c139d08f4f87d0493af8c49b369fcad2f6267e85
author Chris Dalton <csmartdalton@google.com> Thu Sep 26 14:04:24 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 26 21:17:22 2019 +0000
tree 3ce9c73827bff507a245241a685bf95cffc9fe11
parent 988b1e46537deeb711ed0acafbc81c5605a08e5c

Reland "Remove the resolve rect and resolve types from GrRenderTarget"

This is a reland of ec85f407bfee58f1d8b80966256cf746bde2591a

Original change's description:
> Remove the resolve rect and resolve types from GrRenderTarget
> 
> Change-Id: Id0c1155130c23e835490714fe1314f4ec4a83015
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/240002
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

Change-Id: I501b1e1f506cda284876522b0294215030744888
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244673
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrTextureResolveRenderTask.cpp

diff --git a/src/gpu/GrTextureResolveRenderTask.cpp b/src/gpu/GrTextureResolveRenderTask.cpp
index 92e505e..e12bbc8 100644
--- a/src/gpu/GrTextureResolveRenderTask.cpp
+++ b/src/gpu/GrTextureResolveRenderTask.cpp
@@ -69,12 +69,10 @@
     for (const auto& resolve : fResolves) {
         if (GrSurfaceProxy::ResolveFlags::kMSAA & resolve.fFlags) {
             // peekRenderTarget might be null if there was an instantiation error.
-            GrRenderTarget* renderTarget = resolve.fProxy->peekRenderTarget();
-            if (renderTarget && renderTarget->needsResolve()) {
+            if (GrRenderTarget* renderTarget = resolve.fProxy->peekRenderTarget()) {
                 flushState->gpu()->resolveRenderTarget(renderTarget, resolve.fMSAAResolveRect,
                                                        resolve.fProxy->origin(),
                                                        GrGpu::ForExternalIO::kNo);
-                SkASSERT(!renderTarget->needsResolve());
             }
         }
     }