commit 1a3f4ab4901c2294d13c785717655ce059eb42fa
author Greg Daniel <egdaniel@google.com> Wed Jun 23 14:10:25 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 23 19:30:38 2021 +0000
tree 0b823809134e451748322763b62fd20751a24b7a
parent d0f4d0d5d4ac4c95383f973265cee2687ebb8033

Fix texture barriers on DMSAA

Bug: skia:11396
Change-Id: Iad74958c05ed086fe85656b9dc5418d5ab4589e7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/419838
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 3c9b49f..ab32cd9 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -373,14 +373,14 @@
 
 #ifdef SK_DEBUG
     // This block checks for any unnecessary splits in the opsTasks. If two sequential opsTasks
-    // share the same backing GrSurfaceProxy it means the opsTask was artificially split.
+    // could have merged it means the opsTask was artificially split.
     if (!fDAG.empty()) {
         GrOpsTask* prevOpsTask = fDAG[0]->asOpsTask();
         for (int i = 1; i < fDAG.count(); ++i) {
             GrOpsTask* curOpsTask = fDAG[i]->asOpsTask();
 
             if (prevOpsTask && curOpsTask) {
-                SkASSERT(prevOpsTask->target(0) != curOpsTask->target(0));
+                SkASSERT(!prevOpsTask->canMerge(curOpsTask));
             }
 
             prevOpsTask = curOpsTask;