diff options
author | Brian Salomon <bsalomon@google.com> | 2018-07-11 15:58:57 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-11 20:36:38 +0000 |
commit | 238069b3f58d3b20f710f77a64632470a3bf256a (patch) | |
tree | cb4545c08c079aada830c52968c74c4e6af85bcd /include | |
parent | 97c6a0ee41bb1af9cc81695590e2bb97ec85fecf (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/gpu/GrResourceKey.h | 18 | ||||
-rw-r--r-- | include/private/SkMessageBus.h | 16 |
2 files changed, 21 insertions, 13 deletions
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h index 90b84d72bf..5e9bf1f5c0 100644 --- a/include/gpu/GrResourceKey.h +++ b/include/gpu/GrResourceKey.h @@ -8,13 +8,13 @@ #ifndef GrResourceKey_DEFINED #define GrResourceKey_DEFINED +#include <new> #include "../private/SkOnce.h" #include "../private/SkTemplates.h" #include "../private/SkTo.h" #include "GrTypes.h" #include "SkData.h" #include "SkString.h" -#include <new> uint32_t GrResourceKeyHash(const uint32_t* data, size_t size); @@ -315,18 +315,22 @@ static inline void gr_init_static_unique_key_once(SkAlignedSTStorage<1,GrUniqueK // The cache listens for these messages to purge junk resources proactively. class GrUniqueKeyInvalidatedMessage { public: - explicit GrUniqueKeyInvalidatedMessage(const GrUniqueKey& key) : fKey(key) {} + GrUniqueKeyInvalidatedMessage(const GrUniqueKey& key, uint32_t contextUniqueID) + : fKey(key), fContextID(contextUniqueID) { + SkASSERT(SK_InvalidUniqueID != contextUniqueID); + } - GrUniqueKeyInvalidatedMessage(const GrUniqueKeyInvalidatedMessage& that) : fKey(that.fKey) {} + GrUniqueKeyInvalidatedMessage(const GrUniqueKeyInvalidatedMessage&) = default; - GrUniqueKeyInvalidatedMessage& operator=(const GrUniqueKeyInvalidatedMessage& that) { - fKey = that.fKey; - return *this; - } + GrUniqueKeyInvalidatedMessage& operator=(const GrUniqueKeyInvalidatedMessage&) = default; const GrUniqueKey& key() const { return fKey; } + bool shouldSend(uint32_t inboxID) const { return fContextID == inboxID; } + private: GrUniqueKey fKey; + uint32_t fContextID; }; + #endif diff --git a/include/private/SkMessageBus.h b/include/private/SkMessageBus.h index 19e937555d..418235d68e 100644 --- a/include/private/SkMessageBus.h +++ b/include/private/SkMessageBus.h @@ -14,13 +14,17 @@ #include "SkTDArray.h" #include "SkTypes.h" +/** + * Message must implement bool Message::shouldSend(uint32_t inboxID) const. Perhaps someday we + * can use std::experimental::is_detected to avoid this requirement by sending to all inboxes when + * the method is not detected on Message. + */ template <typename Message> class SkMessageBus : SkNoncopyable { public: - // Post a message to be received by Inboxes for this Message type. Threadsafe. - // If id is SK_InvalidUniqueID then it will be sent to all inboxes. - // Otherwise it will be sent to the inbox with that id. - static void Post(const Message& m, uint32_t destID = SK_InvalidUniqueID); + // Post a message to be received by Inboxes for this Message type. Checks + // Message::shouldSend() for each inbox. Threadsafe. + static void Post(const Message& m); class Inbox { public: @@ -102,11 +106,11 @@ template <typename Message> SkMessageBus<Message>::SkMessageBus() {} template <typename Message> -/*static*/ void SkMessageBus<Message>::Post(const Message& m, uint32_t destID) { +/*static*/ void SkMessageBus<Message>::Post(const Message& m) { SkMessageBus<Message>* bus = SkMessageBus<Message>::Get(); SkAutoMutexAcquire lock(bus->fInboxesMutex); for (int i = 0; i < bus->fInboxes.count(); i++) { - if (SK_InvalidUniqueID == destID || bus->fInboxes[i]->fUniqueID == destID) { + if (m.shouldSend(bus->fInboxes[i]->fUniqueID)) { bus->fInboxes[i]->receive(m); } } |