commit 12a68422adf67ea604a2942847ae399a728824f8
author Robert Phillips <robertphillips@google.com> Fri Mar 23 14:20:42 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 23 18:53:20 2018 +0000
tree 013c4b49737d202cb6924e7caaa4b7b549ab3079
parent a6e30f75fcd70636b835c8fb24005b84a1dd0d25

Disable DDL assert to unblock Chrome

Chrome is replaying DDLs into FBO 0 which impacts several rendering capabilities. FBO 0-ness of the final destination currently isn't part of SkSurfaceCharacterization so the surface flags aren't being set appropriately for the expected capabilities.

Bug: skia:7748
Change-Id: I0d2bf3f689f8f75990443a0d5959f016d16f5d97
Reviewed-on: https://skia-review.googlesource.com/116188
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrSurfaceProxy.cpp

diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 2aa13c8..1016390 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -181,8 +181,10 @@
     SkASSERT(!fTarget && surface);
 
     // Check that our a priori computation matched the ultimate reality
-    SkASSERT((fSurfaceFlags & ~GrInternalSurfaceFlags::kNoPendingIO) ==
-             surface->surfacePriv().flags());
+    // DDL TODO: re-enable this after skbug.com/7748 (Add FBO-0-ness to SkSurfaceCharacterization)
+    // is fixed.
+//    SkASSERT((fSurfaceFlags & ~GrInternalSurfaceFlags::kNoPendingIO) ==
+//             surface->surfacePriv().flags());
 
     fTarget = surface.release();