commit 6fc04f88a89ed2c9a1b4aa48bcd28602a69a457b
author Brian Salomon <bsalomon@google.com> Wed Oct 02 19:11:55 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 03 01:41:35 2019 +0000
tree a572801510942e6bb3bda105c3d1484d31efd281
parent 768f900a88cbfc5237e8edcc16aadde32536ed3e

Reland "SkSurface asynchronous read APIs allow client to extend pixel lifetime"

This is a reland of ce240cc6fd8ec95bd051c7df2173dad2ae8f6ad6

Original change's description:
> SkSurface asynchronous read APIs allow client to extend pixel lifetime
> 
> Previously the pixel data passed to the client was only valid during
> the client's callback. This meant if the client wanted to defer
> processing of the data a copy was necessary.
> 
> Now we pass an object to the callback and the pixel lifetime is tied
> to the lifetime of that object.
> 
> The object may be holding a GPU transfer buffer mapped. We don't assume
> that the object will be released on the direct GrContext thread. So
> when the object is destroyed it posts a message to a new type,
> GrClientMappedBufferManager, hanging off the direct context. The direct
> context will periodically check for messages and unmap and then unref
> buffers so that they can be reused. Currently this is done in
> GrContext::performDeferredCleanup() and GrDrawingManager::flush().
> 
> The old API is kept around for backwards compatibility but it is
> reimplemented as a bridge on top of the new mechanism.
> 
> Also a utility function to SkImageInfo is added to directly make a new
> info with a specified dimensions rather than passing the width and
> height separately to makeWH().
> 
> Bug: chromium:973403
> Bug: skia:8962
> 
> Change-Id: Id5cf04235376170142a48e90d3ecd13fd021a2a6
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245457
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

Bug: chromium:973403, skia:8962
Change-Id: I5cecd36276c8b6dc942cf549c7095db2df88530c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245678
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index a41922d..7319ba5 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -5,13 +5,15 @@
  * found in the LICENSE file.
  */
 
+#include "include/gpu/GrContext.h"
+
 #include "include/core/SkTraceMemoryDump.h"
 #include "include/gpu/GrBackendSemaphore.h"
-#include "include/gpu/GrContext.h"
 #include "include/private/SkDeferredDisplayList.h"
 #include "include/private/SkImageInfoPriv.h"
 #include "src/core/SkMakeUnique.h"
 #include "src/core/SkTaskGroup.h"
+#include "src/gpu/GrClientMappedBufferManager.h"
 #include "src/gpu/GrDrawingManager.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrMemoryPool.h"
@@ -31,7 +33,6 @@
 #include "src/gpu/text/GrTextContext.h"
 #include "src/image/SkSurface_Gpu.h"
 #include <atomic>
-#include <unordered_map>
 
 #define ASSERT_OWNED_PROXY(P) \
     SkASSERT(!(P) || !((P)->peekTexture()) || (P)->peekTexture()->getContext() == this)
@@ -97,6 +98,8 @@
         fShaderErrorHandler = GrShaderUtils::DefaultShaderErrorHandler();
     }
 
+    fMappedBufferManager = skstd::make_unique<GrClientMappedBufferManager>();
+
     return true;
 }
 
@@ -113,6 +116,8 @@
 
     INHERITED::abandonContext();
 
+    fMappedBufferManager->abandon();
+
     fResourceProvider->abandon();
 
     // Need to cleanup the drawing manager first so all the render targets
@@ -124,6 +129,8 @@
     fResourceCache->abandonAll();
 
     fGpu->disconnect(GrGpu::DisconnectType::kAbandon);
+
+    fMappedBufferManager.reset();
 }
 
 void GrContext::releaseResourcesAndAbandonContext() {
@@ -133,6 +140,8 @@
 
     INHERITED::abandonContext();
 
+    fMappedBufferManager.reset();
+
     fResourceProvider->abandon();
 
     // Need to cleanup the drawing manager first so all the render targets
@@ -184,6 +193,11 @@
 
     ASSERT_SINGLE_OWNER
 
+    if (this->abandoned()) {
+        return;
+    }
+
+    fMappedBufferManager->process();
     auto purgeTime = GrStdSteadyClock::now() - msNotUsed;
 
     fResourceCache->purgeAsNeeded();