commit 6aeb8e84dfb474de6482062df9a2766a65cd817b
author Chris Dalton <csmartdalton@google.com> Tue Aug 27 11:52:19 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 27 18:24:27 2019 +0000
tree 8a1c2d20400bea39914412d0cb4f2ab397a3b619
parent 674ee74e88d710e4256810125828993485f25bff

Add renderTasks to the DAG before calling addDependency

This makes sure the dependent task is already in the DAG before a
textureResolveRenderTask calls "addBeforeLast".

Bug: skia:
Change-Id: Ib276d41c386fd3d5a237212d60d7bf67a662e419
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237257
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 1e52b87..0ae9356 100644
--- a/src/gpu/GrTextureResolveRenderTask.cpp
+++ b/src/gpu/GrTextureResolveRenderTask.cpp
@@ -13,30 +13,23 @@
 #include "src/gpu/GrResourceAllocator.h"
 #include "src/gpu/GrTexturePriv.h"
 
-sk_sp<GrRenderTask> GrTextureResolveRenderTask::Make(
-        sk_sp<GrTextureProxy> textureProxy, GrTextureResolveFlags flags, const GrCaps& caps) {
-    GrTextureProxy* textureProxyPtr = textureProxy.get();
-    sk_sp<GrTextureResolveRenderTask> resolveTask(
-            new GrTextureResolveRenderTask(std::move(textureProxy), flags));
-
+void GrTextureResolveRenderTask::init(const GrCaps& caps) {
     // Add the target as a dependency: We will read the existing contents of this texture while
     // generating mipmap levels and/or resolving MSAA.
     //
     // NOTE: This must be called before makeClosed.
-    resolveTask->addDependency(
-            textureProxyPtr, GrMipMapped::kNo, GrTextureResolveManager(nullptr), caps);
-    textureProxyPtr->setLastRenderTask(resolveTask.get());
+    this->addDependency(fTarget.get(), GrMipMapped::kNo, GrTextureResolveManager(nullptr), caps);
+    fTarget->setLastRenderTask(this);
 
     // We only resolve the texture; nobody should try to do anything else with this opsTask.
-    resolveTask->makeClosed(caps);
+    this->makeClosed(caps);
 
-    if (GrTextureResolveFlags::kMipMaps & flags) {
-        SkASSERT(GrMipMapped::kYes == textureProxyPtr->mipMapped());
-        SkASSERT(textureProxyPtr->mipMapsAreDirty());
-        textureProxyPtr->markMipMapsClean();
+    if (GrTextureResolveFlags::kMipMaps & fResolveFlags) {
+        GrTextureProxy* textureProxy = fTarget->asTextureProxy();
+        SkASSERT(GrMipMapped::kYes == textureProxy->mipMapped());
+        SkASSERT(textureProxy->mipMapsAreDirty());
+        textureProxy->markMipMapsClean();
     }
-
-    return resolveTask;
 }
 
 void GrTextureResolveRenderTask::gatherProxyIntervals(GrResourceAllocator* alloc) const {