commit e8d3ccadfe4d95fb6692deae8571f1a5fd5866cf
author Greg Daniel <egdaniel@google.com> Wed Jun 10 10:04:48 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 10 20:00:20 2020 +0000
tree d3ea6a19928385953d23a9b2089de3a7f04d2fc4
parent 2577623202bb8ae89013272b74dfa953376e2cc4

Remove GrPrepareForExternalIORequests from flush.

Now that we have the GrContext setBackendTextureState calls we no longer
need these to be on flush.

Bug: skia:10254
Change-Id: I7c44667a327de11dd853e3e71b114959a7bcee86
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/295447
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index e27a63e..f74e860 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -213,8 +213,7 @@
 
 // MDB TODO: make use of the 'proxy' parameter.
 bool GrDrawingManager::flush(GrSurfaceProxy* proxies[], int numProxies,
-        SkSurface::BackendSurfaceAccess access, const GrFlushInfo& info,
-        const GrPrepareForExternalIORequests& externalRequests) {
+        SkSurface::BackendSurfaceAccess access, const GrFlushInfo& info) {
     SkASSERT(numProxies >= 0);
     SkASSERT(!numProxies || proxies);
     GR_CREATE_TRACE_MARKER_CONTEXT("GrDrawingManager", "flush", fContext);
@@ -232,8 +231,7 @@
     SkDEBUGCODE(this->validate());
 
     if (kNone_GrFlushFlags == info.fFlags && !info.fNumSemaphores && !info.fFinishedProc &&
-            access == SkSurface::BackendSurfaceAccess::kNoAccess &&
-            !externalRequests.hasRequests()) {
+            access == SkSurface::BackendSurfaceAccess::kNoAccess) {
         bool canSkip = numProxies > 0;
         for (int i = 0; i < numProxies && canSkip; ++i) {
             canSkip = !fDAG.isUsed(proxies[i]) && !this->isDDLTarget(proxies[i]);
@@ -392,7 +390,7 @@
     opMemoryPool->isEmpty();
 #endif
 
-    gpu->executeFlushInfo(proxies, numProxies, access, info, externalRequests);
+    gpu->executeFlushInfo(proxies, numProxies, access, info);
 
     // Give the cache a chance to purge resources that become purgeable due to flushing.
     if (flushed) {
@@ -589,8 +587,7 @@
     // TODO: It is important to upgrade the drawingmanager to just flushing the
     // portion of the DAG required by 'proxies' in order to restore some of the
     // semantics of this method.
-    bool didFlush = this->flush(proxies, numProxies, access, info,
-                                GrPrepareForExternalIORequests());
+    bool didFlush = this->flush(proxies, numProxies, access, info);
     for (int i = 0; i < numProxies; ++i) {
         resolve_and_mipmap(gpu, proxies[i]);
     }
@@ -996,8 +993,7 @@
 
     auto resourceCache = direct->priv().getResourceCache();
     if (resourceCache && resourceCache->requestsFlush()) {
-        if (this->flush(nullptr, 0, SkSurface::BackendSurfaceAccess::kNoAccess, GrFlushInfo(),
-                        GrPrepareForExternalIORequests())) {
+        if (this->flush(nullptr, 0, SkSurface::BackendSurfaceAccess::kNoAccess, GrFlushInfo())) {
             this->submitToGpu(false);
         }
         resourceCache->purgeAsNeeded();