diff options
author | Brian Salomon <bsalomon@google.com> | 2018-07-11 20:01:19 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-11 20:01:28 +0000 |
commit | 143cf8e5994c54aa8c1b721f7af1d3fc9fd83602 (patch) | |
tree | 3fd8ad986ffb3bf0739532b05d0df10f863e41a9 /include/private | |
parent | f4c5bb9aba485aa47c27b15905d81992b7cf4707 (diff) |
Revert "Make GPU cache invalidation SkMessageBus messages go to one GrContext."
This reverts commit f4c5bb9aba485aa47c27b15905d81992b7cf4707.
Reason for revert: Accidentally submitted without CQ
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>
TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: Iadb667d8027341703d254325320ddaa528fb33a1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/140800
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/SkMessageBus.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/private/SkMessageBus.h b/include/private/SkMessageBus.h index 418235d68e..19e937555d 100644 --- a/include/private/SkMessageBus.h +++ b/include/private/SkMessageBus.h @@ -14,17 +14,13 @@ #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. Checks - // Message::shouldSend() for each inbox. Threadsafe. - static void Post(const Message& m); + // 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); class Inbox { public: @@ -106,11 +102,11 @@ template <typename Message> SkMessageBus<Message>::SkMessageBus() {} template <typename Message> -/*static*/ void SkMessageBus<Message>::Post(const Message& m) { +/*static*/ void SkMessageBus<Message>::Post(const Message& m, uint32_t destID) { SkMessageBus<Message>* bus = SkMessageBus<Message>::Get(); SkAutoMutexAcquire lock(bus->fInboxesMutex); for (int i = 0; i < bus->fInboxes.count(); i++) { - if (m.shouldSend(bus->fInboxes[i]->fUniqueID)) { + if (SK_InvalidUniqueID == destID || bus->fInboxes[i]->fUniqueID == destID) { bus->fInboxes[i]->receive(m); } } |