commit 238069b3f58d3b20f710f77a64632470a3bf256a
author Brian Salomon <bsalomon@google.com> Wed Jul 11 15:58:57 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 11 20:36:38 2018 +0000
tree cb4545c08c079aada830c52968c74c4e6af85bcd
parent 97c6a0ee41bb1af9cc81695590e2bb97ec85fecf

Reland "Make GPU cache invalidation SkMessageBus messages go to one GrContext."

This is a reland of f4c5bb9aba485aa47c27b15905d81992b7cf4707

Original change's description:
> Make GPU cache invalidation SkMessageBus messages go to one GrContext.
> 
> Makes it so the template param to SkMessageBus must implement:
> bool shouldSend(uint32_t inboxID) const
> 
> Updates all GPU backend message types to only go to the GrContext that
> is adding a cache entry.
> 
> Bug: skia:
> Change-Id: I3e8a4eb90654b7b8ac57cac9fb508c0ef1d51058
> Reviewed-on: https://skia-review.googlesource.com/140220
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Jim Van Verth <jvanverth@google.com>

Bug: skia:
Change-Id: I8402bfe3ed0170c99936d47050458817030b473b
Reviewed-on: https://skia-review.googlesource.com/140801
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/ccpr/GrCCPathCache.h

diff --git a/src/gpu/ccpr/GrCCPathCache.h b/src/gpu/ccpr/GrCCPathCache.h
index 67e7d9f..7a552bb 100644
--- a/src/gpu/ccpr/GrCCPathCache.h
+++ b/src/gpu/ccpr/GrCCPathCache.h
@@ -121,14 +121,15 @@
     // Called once our path has been rendered into the mainline CCPR (fp16, coverage count) atlas.
     // The caller will stash this atlas texture away after drawing, and during the next flush,
     // recover it and attempt to copy any paths that got reused into permanent 8-bit atlases.
-    void initAsStashedAtlas(const GrUniqueKey& atlasKey, const SkIVector& atlasOffset,
-                            const SkRect& devBounds, const SkRect& devBounds45,
-                            const SkIRect& devIBounds, const SkIVector& maskShift);
+    void initAsStashedAtlas(const GrUniqueKey& atlasKey, uint32_t contextUniqueID,
+                            const SkIVector& atlasOffset, const SkRect& devBounds,
+                            const SkRect& devBounds45, const SkIRect& devIBounds,
+                            const SkIVector& maskShift);
 
     // Called once our path mask has been copied into a permanent, 8-bit atlas. This method points
     // the entry at the new atlas and updates the CachedAtlasInfo data.
-    void updateToCachedAtlas(const GrUniqueKey& atlasKey, const SkIVector& newAtlasOffset,
-                             sk_sp<GrCCAtlas::CachedAtlasInfo>);
+    void updateToCachedAtlas(const GrUniqueKey& atlasKey, uint32_t contextUniqueID,
+                             const SkIVector& newAtlasOffset, sk_sp<GrCCAtlas::CachedAtlasInfo>);
 
     const GrUniqueKey& atlasKey() const { return fAtlasKey; }
 
@@ -162,6 +163,7 @@
     // Called when our corresponding path is modified or deleted.
     void onChange() override;
 
+    uint32_t fContextUniqueID;
     GrCCPathCache* fCacheWeakPtr;  // Gets manually reset to null by the path cache upon eviction.
     MaskTransform fMaskTransform;
     int fHitCount = 1;