Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(849)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/ResourceCacheTest.cpp

Issue 704563004: Revert of Add mock context and use in ResourceCacheTest. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrTest.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/ResourceCacheTest.cpp
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 44e41807d1f8783f0e6b0fc66b1607835c7f9ab8..4e6e281a40f125ef577634092678e5fe09db1806 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -11,7 +11,6 @@
#include "GrContextFactory.h"
#include "GrGpu.h"
#include "GrResourceCache.h"
-#include "GrResourceCache2.h"
#include "SkCanvas.h"
#include "SkSurface.h"
#include "Test.h"
@@ -20,7 +19,9 @@
static const int gHeight = 480;
////////////////////////////////////////////////////////////////////////////////
-static void test_cache(skiatest::Reporter* reporter, GrContext* context, SkCanvas* canvas) {
+static void test_cache(skiatest::Reporter* reporter,
+ GrContext* context,
+ SkCanvas* canvas) {
const SkIRect size = SkIRect::MakeWH(gWidth, gHeight);
SkBitmap src;
@@ -70,12 +71,12 @@
, fCache(NULL)
, fToDelete(NULL)
, fSize(size) {
- ++fNumAlive;
+ ++fAlive;
this->registerWithCache();
}
~TestResource() {
- --fNumAlive;
+ --fAlive;
if (fToDelete) {
// Breaks our little 2-element cycle below.
fToDelete->setDeleteWhenDestroyed(NULL, NULL);
@@ -91,7 +92,7 @@
size_t gpuMemorySize() const SK_OVERRIDE { return fSize; }
- static int NumAlive() { return fNumAlive; }
+ static int alive() { return fAlive; }
void setDeleteWhenDestroyed(GrResourceCache* cache, TestResource* resource) {
fCache = cache;
@@ -102,11 +103,11 @@
GrResourceCache* fCache;
TestResource* fToDelete;
size_t fSize;
- static int fNumAlive;
+ static int fAlive;
typedef GrGpuResource INHERITED;
};
-int TestResource::fNumAlive = 0;
+int TestResource::fAlive = 0;
static void test_purge_invalidated(skiatest::Reporter* reporter, GrContext* context) {
GrCacheID::Domain domain = GrCacheID::GenerateDomain();
@@ -115,34 +116,31 @@
keyData.fData64[1] = 18;
GrResourceKey::ResourceType t = GrResourceKey::GenerateResourceType();
GrResourceKey key(GrCacheID(domain, keyData), t, 0);
-
- context->setResourceCacheLimits(5, 30000);
- GrResourceCache* cache = context->getResourceCache();
- cache->purgeAllUnlocked();
- SkASSERT(0 == cache->getCachedResourceCount() && 0 == cache->getCachedResourceBytes());
+
+ GrResourceCache cache(context->getGpu()->caps(), 5, 30000);
// Add two resources with the same key that delete each other from the cache when destroyed.
TestResource* a = new TestResource(context->getGpu());
TestResource* b = new TestResource(context->getGpu());
- cache->addResource(key, a);
- cache->addResource(key, b);
+ cache.addResource(key, a);
+ cache.addResource(key, b);
// Circle back.
- a->setDeleteWhenDestroyed(cache, b);
- b->setDeleteWhenDestroyed(cache, a);
+ a->setDeleteWhenDestroyed(&cache, b);
+ b->setDeleteWhenDestroyed(&cache, a);
a->unref();
b->unref();
// Add a third independent resource also with the same key.
GrGpuResource* r = new TestResource(context->getGpu());
- cache->addResource(key, r);
+ cache.addResource(key, r);
r->unref();
// Invalidate all three, all three should be purged and destroyed.
- REPORTER_ASSERT(reporter, 3 == TestResource::NumAlive());
+ REPORTER_ASSERT(reporter, 3 == TestResource::alive());
const GrResourceInvalidatedMessage msg = { key };
SkMessageBus<GrResourceInvalidatedMessage>::Post(msg);
- cache->purgeAsNeeded();
- REPORTER_ASSERT(reporter, 0 == TestResource::NumAlive());
+ cache.purgeAsNeeded();
+ REPORTER_ASSERT(reporter, 0 == TestResource::alive());
}
static void test_cache_delete_on_destruction(skiatest::Reporter* reporter,
@@ -156,44 +154,38 @@
GrResourceKey key(GrCacheID(domain, keyData), t, 0);
{
- context->setResourceCacheLimits(3, 30000);
- GrResourceCache* cache = context->getResourceCache();
- cache->purgeAllUnlocked();
- SkASSERT(0 == cache->getCachedResourceCount() && 0 == cache->getCachedResourceBytes());
-
+ {
+ GrResourceCache cache(context->getGpu()->caps(), 3, 30000);
+ TestResource* a = new TestResource(context->getGpu());
+ TestResource* b = new TestResource(context->getGpu());
+ cache.addResource(key, a);
+ cache.addResource(key, b);
+
+ a->setDeleteWhenDestroyed(&cache, b);
+ b->setDeleteWhenDestroyed(&cache, a);
+
+ a->unref();
+ b->unref();
+ REPORTER_ASSERT(reporter, 2 == TestResource::alive());
+ }
+ REPORTER_ASSERT(reporter, 0 == TestResource::alive());
+ }
+ {
+ GrResourceCache cache(context->getGpu()->caps(), 3, 30000);
TestResource* a = new TestResource(context->getGpu());
TestResource* b = new TestResource(context->getGpu());
- cache->addResource(key, a);
- cache->addResource(key, b);
-
- a->setDeleteWhenDestroyed(cache, b);
- b->setDeleteWhenDestroyed(cache, a);
+ cache.addResource(key, a);
+ cache.addResource(key, b);
+
+ a->setDeleteWhenDestroyed(&cache, b);
+ b->setDeleteWhenDestroyed(&cache, a);
a->unref();
b->unref();
- REPORTER_ASSERT(reporter, 2 == TestResource::NumAlive());
- cache->purgeAllUnlocked();
- REPORTER_ASSERT(reporter, 0 == TestResource::NumAlive());
- }
- {
- context->setResourceCacheLimits(3, 30000);
- GrResourceCache* cache = context->getResourceCache();
- cache->purgeAllUnlocked();
- SkASSERT(0 == cache->getCachedResourceCount() && 0 == cache->getCachedResourceBytes());
- TestResource* a = new TestResource(context->getGpu());
- TestResource* b = new TestResource(context->getGpu());
- cache->addResource(key, a);
- cache->addResource(key, b);
-
- a->setDeleteWhenDestroyed(cache, b);
- b->setDeleteWhenDestroyed(cache, a);
-
- a->unref();
- b->unref();
-
- cache->deleteResource(a->getCacheEntry());
-
- REPORTER_ASSERT(reporter, 0 == TestResource::NumAlive());
+
+ cache.deleteResource(a->getCacheEntry());
+
+ REPORTER_ASSERT(reporter, 0 == TestResource::alive());
}
}
@@ -214,54 +206,48 @@
// Test changing resources sizes (both increase & decrease).
{
- context->setResourceCacheLimits(3, 30000);
- GrResourceCache* cache = context->getResourceCache();
- cache->purgeAllUnlocked();
- SkASSERT(0 == cache->getCachedResourceCount() && 0 == cache->getCachedResourceBytes());
+ GrResourceCache cache(context->getGpu()->caps(), 2, 300);
TestResource* a = new TestResource(context->getGpu());
a->setSize(100); // Test didChangeGpuMemorySize() when not in the cache.
- cache->addResource(key1, a);
+ cache.addResource(key1, a);
a->unref();
TestResource* b = new TestResource(context->getGpu());
b->setSize(100);
- cache->addResource(key2, b);
+ 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());
+ 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());
}
// Test increasing a resources size beyond the cache budget.
{
- context->setResourceCacheLimits(2, 300);
- GrResourceCache* cache = context->getResourceCache();
- cache->purgeAllUnlocked();
- SkASSERT(0 == cache->getCachedResourceCount() && 0 == cache->getCachedResourceBytes());
+ GrResourceCache cache(context->getGpu()->caps(), 2, 300);
TestResource* a = new TestResource(context->getGpu(), 100);
- cache->addResource(key1, a);
+ cache.addResource(key1, a);
a->unref();
TestResource* b = new TestResource(context->getGpu(), 100);
- cache->addResource(key2, b);
+ 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, !cache->hasKey(key1));
-
- REPORTER_ASSERT(reporter, 201 == cache->getCachedResourceBytes());
- REPORTER_ASSERT(reporter, 1 == cache->getCachedResourceCount());
+ 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());
}
}
@@ -273,6 +259,10 @@
continue;
}
GrContext* context = factory->get(glType);
+ if (NULL == context) {
+ continue;
+ }
+
GrSurfaceDesc desc;
desc.fConfig = kSkia8888_GrPixelConfig;
desc.fFlags = kRenderTarget_GrSurfaceFlag;
@@ -280,19 +270,12 @@
desc.fHeight = gHeight;
SkImageInfo info = SkImageInfo::MakeN32Premul(gWidth, gHeight);
SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, info));
+
test_cache(reporter, context, surface->getCanvas());
- }
-
- // The below tests use a mock context.
- SkAutoTUnref<GrContext> context(GrContext::CreateMockContext());
- REPORTER_ASSERT(reporter, SkToBool(context));
- if (NULL == context) {
- return;
- }
-
- test_purge_invalidated(reporter, context);
- test_cache_delete_on_destruction(reporter, context);
- test_resource_size_changed(reporter, context);
+ test_purge_invalidated(reporter, context);
+ test_cache_delete_on_destruction(reporter, context);
+ test_resource_size_changed(reporter, context);
+ }
}
#endif
« no previous file with comments | « src/gpu/GrTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698