commit 798a31dd8ad3537c3fd51e68318d6b842c96dba8
author Chris Dalton <csmartdalton@google.com> Thu Sep 26 19:28:32 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 26 19:28:47 2019 +0000
tree 0bd0386bfceae189653a90a614a266cc297a0d35
parent 61887c7b88fc93f7d14cd244b100ed87642a65cd

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

This reverts commit ec85f407bfee58f1d8b80966256cf746bde2591a.

Reason for revert: Vulkan crashes

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>

TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,csmartdalton@google.com

Change-Id: Ie138488086a1a91599ad0f5ede4272ac286895c9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/244660
Reviewed-by: Chris Dalton <csmartdalton@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 2230edf..92e505e 100644
--- a/src/gpu/GrTextureResolveRenderTask.cpp
+++ b/src/gpu/GrTextureResolveRenderTask.cpp
@@ -70,9 +70,12 @@
         if (GrSurfaceProxy::ResolveFlags::kMSAA & resolve.fFlags) {
             // peekRenderTarget might be null if there was an instantiation error.
             GrRenderTarget* renderTarget = resolve.fProxy->peekRenderTarget();
-            flushState->gpu()->resolveRenderTarget(renderTarget, resolve.fMSAAResolveRect,
-                                                   resolve.fProxy->origin(),
-                                                   GrGpu::ForExternalIO::kNo);
+            if (renderTarget && renderTarget->needsResolve()) {
+                flushState->gpu()->resolveRenderTarget(renderTarget, resolve.fMSAAResolveRect,
+                                                       resolve.fProxy->origin(),
+                                                       GrGpu::ForExternalIO::kNo);
+                SkASSERT(!renderTarget->needsResolve());
+            }
         }
     }
     // Regenerate all mipmaps back-to-back.