diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-08 20:46:17 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-08 20:46:26 +0000 |
| commit | 449d78f5a8e73407b314aa6cb4e60a8273f0d410 (patch) | |
| tree | e2cf8993a9dc917b69aa0dcfb0bc7904fbdf05e6 /src/gpu/GrResourceCache.cpp | |
| parent | 823bdd96ef85c2e8bbea2bbeeff270b29755413d (diff) | |
Revert "Added SkImage::MakeCrossContextFromEncoded"
This reverts commit 83b1b3db36e8622f4bbc8c391d5c714e258d1e03.
Reason for revert: unit test failing and asan leaks
Original change's description:
> Added SkImage::MakeCrossContextFromEncoded
>
> Designed for Flutter's threading architecture, with
> an eye to being useful to other clients. Under the
> hood, uses a new image generator class to lazily wrap
> a texture for multiple GrContexts.
>
> Bug: skia:
> Change-Id: I6c37b12c8ab5bce94b91190e5f0beb91d31ae81b
> Reviewed-on: https://skia-review.googlesource.com/14180
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I1f0bf580aa0ea2d132e18b64ff610ddac9d073a7
Reviewed-on: https://skia-review.googlesource.com/15892
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrResourceCache.cpp')
| -rw-r--r-- | src/gpu/GrResourceCache.cpp | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp index 3d1b9521ee..e3373b27f9 100644 --- a/src/gpu/GrResourceCache.cpp +++ b/src/gpu/GrResourceCache.cpp @@ -18,8 +18,6 @@ DECLARE_SKMESSAGEBUS_MESSAGE(GrUniqueKeyInvalidatedMessage); -DECLARE_SKMESSAGEBUS_MESSAGE(GrGpuResourceFreedMessage); - ////////////////////////////////////////////////////////////////////////////// GrScratchKey::ResourceType GrScratchKey::GenerateResourceType() { @@ -61,7 +59,7 @@ private: ////////////////////////////////////////////////////////////////////////////// -GrResourceCache::GrResourceCache(const GrCaps* caps, uint32_t contextUniqueID) +GrResourceCache::GrResourceCache(const GrCaps* caps) : fTimestamp(0) , fMaxCount(kDefaultMaxCount) , fMaxBytes(kDefaultMaxSize) @@ -77,7 +75,6 @@ GrResourceCache::GrResourceCache(const GrCaps* caps, uint32_t contextUniqueID) , fBudgetedBytes(0) , fRequestFlush(false) , fExternalFlushCnt(0) - , fContextUniqueID(contextUniqueID) , fPreferVRAMUseOverFlushes(caps->preferVRAMUseOverFlushes()) { SkDEBUGCODE(fCount = 0;) SkDEBUGCODE(fNewlyPurgeableResourceForValidation = nullptr;) @@ -453,12 +450,6 @@ void GrResourceCache::purgeAsNeeded() { this->processInvalidUniqueKeys(invalidKeyMsgs); } - SkTArray<GrGpuResourceFreedMessage> freedGpuResourceMsgs; - fFreedGpuResourceInbox.poll(&freedGpuResourceMsgs); - if (freedGpuResourceMsgs.count()) { - this->processFreedGpuResources(freedGpuResourceMsgs); - } - if (fMaxUnusedFlushes > 0) { // We want to know how many complete flushes have occurred without the resource being used. // If the resource was tagged when fExternalFlushCnt was N then this means it became @@ -543,18 +534,6 @@ void GrResourceCache::processInvalidUniqueKeys( } } -void GrResourceCache::insertCrossContextGpuResource(GrGpuResource* resource) { - resource->ref(); -} - -void GrResourceCache::processFreedGpuResources(const SkTArray<GrGpuResourceFreedMessage>& msgs) { - for (int i = 0; i < msgs.count(); ++i) { - if (msgs[i].fOwningUniqueID == fContextUniqueID) { - msgs[i].fResource->unref(); - } - } -} - void GrResourceCache::addToNonpurgeableArray(GrGpuResource* resource) { int index = fNonpurgeableResources.count(); *fNonpurgeableResources.append() = resource; |