commit 0d8722c8b5d3902940995d3e445ff7583dbea99b
author Robert Phillips <robertphillips@google.com> Mon Mar 29 13:29:40 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 30 14:25:55 2021 +0000
tree 2b40eb8e4cda11d74fd98aa645d9e9564ce554f6
parent 3079266f926003f7f6d4f251300ae81cdb39f0c8

Make use of shareable promise images in tools

The main change here is just fusing the following three methods into recreateSKP:
   deflateSKP
   createCallbackContexts
   createSKP

All the remaining changes are just API fallout from that.

Bug: skia:11728
Change-Id: Iae2ce65983ad56c8288bdc830e248394a0055bfb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389925
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tools/DDLPromiseImageHelper.cpp

diff --git a/tools/DDLPromiseImageHelper.cpp b/tools/DDLPromiseImageHelper.cpp
index 1a4119c..9514321 100644
--- a/tools/DDLPromiseImageHelper.cpp
+++ b/tools/DDLPromiseImageHelper.cpp
@@ -94,7 +94,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-sk_sp<SkData> DDLPromiseImageHelper::deflateSKP(const SkPicture* inputPicture) {
+sk_sp<SkPicture> DDLPromiseImageHelper::recreateSKP(GrDirectContext* dContext,
+                                                    SkPicture* inputPicture) {
     SkSerialProcs procs;
 
     procs.fImageCtx = this;
@@ -107,7 +108,14 @@
         return SkData::MakeWithCopy(&id, sizeof(id));
     };
 
-    return inputPicture->serialize(&procs);
+    sk_sp<SkData> compressedPictureData = inputPicture->serialize(&procs);
+    if (!compressedPictureData) {
+        return nullptr;
+    }
+
+    this->createCallbackContexts(dContext);
+
+    return this->reinflateSKP(dContext->threadSafeProxy(), compressedPictureData.get());
 }
 
 static GrBackendTexture create_yuva_texture(GrDirectContext* direct,
@@ -279,9 +287,8 @@
 
 sk_sp<SkPicture> DDLPromiseImageHelper::reinflateSKP(
                                                    sk_sp<GrContextThreadSafeProxy> threadSafeProxy,
-                                                   SkData* compressedPictureData,
-                                                   SkTArray<sk_sp<SkImage>>* promiseImages) const {
-    DeserialImageProcContext procContext { std::move(threadSafeProxy), this, promiseImages };
+                                                   SkData* compressedPictureData) {
+    DeserialImageProcContext procContext { std::move(threadSafeProxy), this };
 
     SkDeserialProcs procs;
     procs.fImageCtx = (void*) &procContext;
@@ -290,13 +297,12 @@
     return SkPicture::MakeFromData(compressedPictureData, &procs);
 }
 
-// This generates promise images to replace the indices in the compressed picture. This
-// reconstitution is performed separately in each thread so we end up with multiple
-// promise images referring to the same GrBackendTexture.
+// This generates promise images to replace the indices in the compressed picture.
 sk_sp<SkImage> DDLPromiseImageHelper::CreatePromiseImages(const void* rawData,
-                                                          size_t length, void* ctxIn) {
+                                                          size_t length,
+                                                          void* ctxIn) {
     DeserialImageProcContext* procContext = static_cast<DeserialImageProcContext*>(ctxIn);
-    const DDLPromiseImageHelper* helper = procContext->fHelper;
+    DDLPromiseImageHelper* helper = procContext->fHelper;
 
     SkASSERT(length == sizeof(int));
 
@@ -308,7 +314,7 @@
     const DDLPromiseImageHelper::PromiseImageInfo& curImage = helper->getInfo(*indexPtr);
 
     // If there is no callback context that means 'createCallbackContexts' determined the
-    // texture wouldn't fit on the GPU. Create a separate bitmap-backed image for each thread.
+    // texture wouldn't fit on the GPU. Create a bitmap-backed image.
     if (!curImage.isYUV() && !curImage.callbackContext(0)) {
         SkASSERT(curImage.baseLevel().isImmutable());
         return curImage.baseLevel().asImage();
@@ -361,7 +367,7 @@
                                             (void*)curImage.refCallbackContext(0).release());
         curImage.callbackContext(0)->wasAddedToImage();
     }
-    procContext->fPromiseImages->push_back(image);
+    helper->fPromiseImages.push_back(image);
     SkASSERT(image);
     return image;
 }