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 /src/gpu/GrProxyProvider.cpp | |
| 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 'src/gpu/GrProxyProvider.cpp')
| -rw-r--r-- | src/gpu/GrProxyProvider.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp index df7b61e700..e259e34e28 100644 --- a/src/gpu/GrProxyProvider.cpp +++ b/src/gpu/GrProxyProvider.cpp @@ -37,32 +37,11 @@ GrProxyProvider::GrProxyProvider(GrResourceProvider* resourceProvider, , fResourceCache(resourceCache) , fAbandoned(false) , fCaps(caps) - , fContextUniqueID(resourceCache->contextUniqueID()) #ifdef SK_DEBUG , fSingleOwner(owner) #endif { - SkASSERT(fResourceProvider); - SkASSERT(fResourceCache); - SkASSERT(fCaps); - SkASSERT(fSingleOwner); -} -GrProxyProvider::GrProxyProvider(uint32_t contextUniqueID, - sk_sp<const GrCaps> caps, - GrSingleOwner* owner) - : fResourceProvider(nullptr) - , fResourceCache(nullptr) - , fAbandoned(false) - , fCaps(caps) - , fContextUniqueID(contextUniqueID) -#ifdef SK_DEBUG - , fSingleOwner(owner) -#endif -{ - SkASSERT(fContextUniqueID != SK_InvalidUniqueID); - SkASSERT(fCaps); - SkASSERT(fSingleOwner); } GrProxyProvider::~GrProxyProvider() { |