commit a43e2d284b3b9c9cbe689ef5bc093b4d9954d604
author Chris Dalton <csmartdalton@google.com> Fri Aug 30 01:14:33 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 30 16:17:33 2019 +0000
tree c37cd4936b131eceae7cc1aecc73f13ffc69350f
parent 2aa85df8e78205736663d7a5c508cc4c5b756bab

Don't assert mips actually need resolve during texResolveRenderTask

Too many exceptions can arise during flush in which the mips won't
actually be marked dirty: Failed to flush GL state, Ops that don't
actually issue any draws, etc. Since the DAG can't and shouldn't
predict these rare exceptions, we just remove the assert.

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

src/gpu/GrOpsTask.h

diff --git a/src/gpu/GrOpsTask.h b/src/gpu/GrOpsTask.h
index b9398b8..d346f1f 100644
--- a/src/gpu/GrOpsTask.h
+++ b/src/gpu/GrOpsTask.h
@@ -101,17 +101,12 @@
 
 private:
     bool isNoOp() const {
-        // TODO: GrLoadOp::kDiscard -> [empty OpsTask] -> GrStoreOp::kStore should also be a no-op.
-        // We don't count it as a no-op right now because of Vulkan. There are real cases where we
-        // store a discard, and if we skip that render pass, then the next time we load the render
-        // target, Vulkan detects loading of uninitialized memory and complains. If we don't skip
-        // storing the discard, then we trick Vulkan and it doesn't notice us doing anything wrong.
-        // We should definitely address this issue properly.
+        // TODO: GrLoadOp::kDiscard (i.e., storing a discard) should also be grounds for skipping
+        // execution. We currently don't because of Vulkan. See http://skbug.com/9373.
         //
         // TODO: We should also consider stencil load/store here. We get away with it for now
         // because we never discard stencil buffers.
-        return fOpChains.empty() && GrLoadOp::kClear != fColorLoadOp &&
-               GrLoadOp::kDiscard != fColorLoadOp;
+        return fOpChains.empty() && GrLoadOp::kLoad == fColorLoadOp;
     }
 
     void deleteOps();

src/gpu/GrTextureResolveRenderTask.cpp

diff --git a/src/gpu/GrTextureResolveRenderTask.cpp b/src/gpu/GrTextureResolveRenderTask.cpp
index 0ae9356..9a4d6b4 100644
--- a/src/gpu/GrTextureResolveRenderTask.cpp
+++ b/src/gpu/GrTextureResolveRenderTask.cpp
@@ -45,8 +45,8 @@
     GrTexture* texture = fTarget->peekTexture();
     SkASSERT(texture);
 
-    if (GrTextureResolveFlags::kMipMaps & fResolveFlags) {
-        SkASSERT(texture->texturePriv().mipMapsAreDirty());
+    if ((GrTextureResolveFlags::kMipMaps & fResolveFlags) &&
+        texture->texturePriv().mipMapsAreDirty()) {
         flushState->gpu()->regenerateMipMapLevels(texture);
     }