commit 0b68ddacadd8791b69c6216f0fbd7439cf7dbbe3
author Chris Dalton <csmartdalton@google.com> Thu Nov 07 21:08:03 2019 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 08 18:36:35 2019 +0000
tree 01f81b8df1e5b149c03aa0f74b1532e764a1ff18
parent c88d1774ed5074c8cd035a279bb6f599139e7484

Defer stencil attachment until opsTask execution

Change-Id: I34cc35d16966d35e26561c40a0300112b2da2fa1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253546
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrOpsTask.cpp

diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index 62a94cd..06d3733 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -484,9 +484,9 @@
         return false;
     }
 
-    GrSurfaceProxy* proxy = fTargetView.proxy();
+    SkASSERT(fTargetView.proxy());
+    GrRenderTargetProxy* proxy = fTargetView.proxy()->asRenderTargetProxy();
     SkASSERT(proxy);
-    SkASSERT(proxy->peekRenderTarget());
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
 
     // Make sure load ops are not kClear if the GPU needs to use draws for clears
@@ -496,7 +496,18 @@
     const GrCaps& caps = *flushState->gpu()->caps();
     GrRenderTarget* renderTarget = proxy->peekRenderTarget();
     SkASSERT(renderTarget);
-    GrStencilAttachment* stencil = renderTarget->renderTargetPriv().getStencilAttachment();
+
+    GrStencilAttachment* stencil = nullptr;
+    if (int numStencilSamples = proxy->numStencilSamples()) {
+        if (!flushState->resourceProvider()->attachStencilAttachment(
+                renderTarget, numStencilSamples)) {
+            SkDebugf("WARNING: failed to attach a stencil buffer. Rendering will be skipped.\n");
+            return false;
+        }
+        stencil = renderTarget->renderTargetPriv().getStencilAttachment();
+    }
+
+    SkASSERT(!stencil || stencil->numSamples() >= proxy->numStencilSamples());
 
     GrLoadOp stencilLoadOp;
     switch (fInitialStencilContent) {