| Index: tests/ResourceCacheTest.cpp
|
| diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
|
| index 7262b43a0ff767ef0db36ecca6f1f23bbf5bffa0..8fc912dfe8983a37cff88c89b4bd73195dc72d3f 100644
|
| --- a/tests/ResourceCacheTest.cpp
|
| +++ b/tests/ResourceCacheTest.cpp
|
| @@ -61,7 +61,8 @@ public:
|
| SK_DECLARE_INST_COUNT(TestResource);
|
| TestResource()
|
| : fCache(NULL)
|
| - , fToDelete(NULL) {
|
| + , fToDelete(NULL)
|
| + , fSize(100) {
|
| ++fAlive;
|
| }
|
|
|
| @@ -74,7 +75,12 @@ public:
|
| }
|
| }
|
|
|
| - size_t gpuMemorySize() const SK_OVERRIDE { return 100; }
|
| + void setSize(size_t size) {
|
| + fSize = size;
|
| + this->onResourceSizeChanged();
|
| + }
|
| +
|
| + size_t gpuMemorySize() const SK_OVERRIDE { return fSize; }
|
|
|
| bool isValidOnGpu() const SK_OVERRIDE { return true; }
|
|
|
| @@ -88,6 +94,7 @@ public:
|
| private:
|
| GrResourceCache* fCache;
|
| TestResource* fToDelete;
|
| + size_t fSize;
|
| static int fAlive;
|
|
|
| typedef GrCacheable INHERITED;
|
| @@ -174,6 +181,67 @@ static void test_cache_delete_on_destruction(skiatest::Reporter* reporter,
|
| }
|
| }
|
|
|
| +static void test_resource_size_changed(skiatest::Reporter* reporter,
|
| + GrContext* context) {
|
| + GrCacheID::Domain domain = GrCacheID::GenerateDomain();\
|
| + GrResourceKey::ResourceType t = GrResourceKey::GenerateResourceType();
|
| +
|
| + GrCacheID::Key key1Data;
|
| + key1Data.fData64[0] = 0;
|
| + key1Data.fData64[1] = 0;
|
| + GrResourceKey key1(GrCacheID(domain, key1Data), t, 0);
|
| +
|
| + GrCacheID::Key key2Data;
|
| + key2Data.fData64[0] = 1;
|
| + key2Data.fData64[1] = 0;
|
| + GrResourceKey key2(GrCacheID(domain, key2Data), t, 0);
|
| +
|
| + {
|
| + GrResourceCache cache(3, 300);
|
| +
|
| + TestResource* a = new TestResource();
|
| + a->setSize(100);
|
| + cache.addResource(key1, a);
|
| + a->unref();
|
| +
|
| + TestResource* b = new TestResource();
|
| + b->setSize(100);
|
| + cache.addResource(key2, b);
|
| + b->unref();
|
| +
|
| + REPORTER_ASSERT(reporter, 200 == cache.getCachedResourceBytes());
|
| + REPORTER_ASSERT(reporter, 2 == cache.getCachedResourceCount());
|
| +
|
| + static_cast<TestResource*>(cache.find(key2))->setSize(200);
|
| + static_cast<TestResource*>(cache.find(key1))->setSize(50);
|
| +
|
| + REPORTER_ASSERT(reporter, 250 == cache.getCachedResourceBytes());
|
| + REPORTER_ASSERT(reporter, 2 == cache.getCachedResourceCount());
|
| + }
|
| + {
|
| + GrResourceCache cache(3, 300);
|
| +
|
| + TestResource* a = new TestResource();
|
| + a->setSize(100);
|
| + cache.addResource(key1, a);
|
| + a->unref();
|
| +
|
| + TestResource* b = new TestResource();
|
| + b->setSize(100);
|
| + cache.addResource(key2, b);
|
| + b->unref();
|
| +
|
| + REPORTER_ASSERT(reporter, 200 == cache.getCachedResourceBytes());
|
| + REPORTER_ASSERT(reporter, 2 == cache.getCachedResourceCount());
|
| +
|
| + static_cast<TestResource*>(cache.find(key2))->setSize(201);
|
| + REPORTER_ASSERT(reporter, NULL == cache.find(key1));
|
| +
|
| + REPORTER_ASSERT(reporter, 201 == cache.getCachedResourceBytes());
|
| + REPORTER_ASSERT(reporter, 1 == cache.getCachedResourceCount());
|
| + }
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| DEF_GPUTEST(ResourceCache, reporter, factory) {
|
| for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
|
| @@ -199,6 +267,7 @@ DEF_GPUTEST(ResourceCache, reporter, factory) {
|
| test_cache(reporter, context, &canvas);
|
| test_purge_invalidated(reporter, context);
|
| test_cache_delete_on_destruction(reporter, context);
|
| + test_resource_size_changed(reporter, context);
|
| }
|
| }
|
|
|
|
|