Allow wrapped resources to have unique keys
Previously, wrapped resources were never budgeted. Now we explicitly allow
wrapped, unbudgeted resources with unique keys. This allows code that
wraps (and re-wraps) external resources with a deterministic key to find
the same wrapped resource - saving time and ensuring a single wrapped
copy, to preserve state on the resource (like texture sampler state).
Bug: skia:
Change-Id: I1dd7642f1ed8bb6c620029d46203cf5cb6b3c160
Reviewed-on: https://skia-review.googlesource.com/15241
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 17e02ba..5590c86 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -471,11 +471,15 @@
new TestResource(context->getGpu(), SkBudgeted::kNo);
unbudgeted->setSize(13);
- // Make sure we can't add a unique key to the wrapped resource
+ // Make sure we can add a unique key to the wrapped resource
GrUniqueKey uniqueKey2;
make_unique_key<0>(&uniqueKey2, 1);
wrapped->resourcePriv().setUniqueKey(uniqueKey2);
- REPORTER_ASSERT(reporter, nullptr == cache->findAndRefUniqueResource(uniqueKey2));
+ GrGpuResource* wrappedViaKey = cache->findAndRefUniqueResource(uniqueKey2);
+ REPORTER_ASSERT(reporter, wrappedViaKey != nullptr);
+
+ // Remove the extra ref we just added.
+ wrappedViaKey->unref();
// Make sure sizes are as we expect
REPORTER_ASSERT(reporter, 4 == cache->getResourceCount());