commit ec85f407bfee58f1d8b80966256cf746bde2591a
author Chris Dalton <csmartdalton@google.com> Wed Sep 25 18:35:13 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 26 18:14:25 2019 +0000
tree fa6a3f885b99e6e91126e5c451a6c9e53b850cd6
parent 31cff2760781b9fb9892470c0d1b79e2e9631b0c

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>

src/gpu/GrTextureResolveRenderTask.cpp

diff --git a/src/gpu/GrTextureResolveRenderTask.cpp b/src/gpu/GrTextureResolveRenderTask.cpp
index 92e505e..2230edf 100644
--- a/src/gpu/GrTextureResolveRenderTask.cpp
+++ b/src/gpu/GrTextureResolveRenderTask.cpp
@@ -70,12 +70,9 @@
         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()) {
-                flushState->gpu()->resolveRenderTarget(renderTarget, resolve.fMSAAResolveRect,
-                                                       resolve.fProxy->origin(),
-                                                       GrGpu::ForExternalIO::kNo);
-                SkASSERT(!renderTarget->needsResolve());
-            }
+            flushState->gpu()->resolveRenderTarget(renderTarget, resolve.fMSAAResolveRect,
+                                                   resolve.fProxy->origin(),
+                                                   GrGpu::ForExternalIO::kNo);
         }
     }
     // Regenerate all mipmaps back-to-back.