diff options
| author |  robertphillips <robertphillips@google.com> | 2014-07-29 07:14:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-29 07:14:49 -0700 |
| commit | 09dde64628fcbf611891fa293c144835c7dfa644 (patch) | |
| tree | 466455532dfa0fbfb4fa26c9e1b3db3bd5f9e788 /tests/GpuLayerCacheTest.cpp | |
| parent | 3a9142437eacf543f5cde6881cc4534868c80f58 (diff) | |
Now always use Atlas for layer cache
This is setup for running cluster telemetry tests
R=bsalomon@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/429593002
Diffstat (limited to 'tests/GpuLayerCacheTest.cpp')
| -rw-r--r-- | tests/GpuLayerCacheTest.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp index d14711633f..8ca7b2bdfb 100644 --- a/tests/GpuLayerCacheTest.cpp +++ b/tests/GpuLayerCacheTest.cpp @@ -100,18 +100,14 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { lock_layer(reporter, &cache, layer); -#if USE_ATLAS // The first 4 layers should be in the atlas (and thus have non-empty // rects) if (i < 4) { REPORTER_ASSERT(reporter, layer->isAtlased()); } else { -#endif // The 5th layer couldn't fit in the atlas REPORTER_ASSERT(reporter, !layer->isAtlased()); -#if USE_ATLAS } -#endif } // Unlock the textures @@ -127,19 +123,15 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { REPORTER_ASSERT(reporter, NULL != layer); REPORTER_ASSERT(reporter, !layer->locked()); -#if USE_ATLAS // The first 4 layers should still be in the atlas. if (i < 4) { REPORTER_ASSERT(reporter, NULL != layer->texture()); REPORTER_ASSERT(reporter, layer->isAtlased()); } else { -#endif // The final layer should be unlocked. REPORTER_ASSERT(reporter, NULL == layer->texture()); REPORTER_ASSERT(reporter, !layer->isAtlased()); -#if USE_ATLAS } -#endif } { @@ -155,7 +147,6 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { for (int i = 0; i < kInitialNumLayers+1; ++i) { GrCachedLayer* layer = cache.findLayer(picture, i); -#if USE_ATLAS // 3 old layers plus the new one should be in the atlas. if (1 == i || 2 == i || 3 == i || 5 == i) { REPORTER_ASSERT(reporter, NULL != layer); @@ -163,18 +154,15 @@ DEF_GPUTEST(GpuLayerCache, reporter, factory) { REPORTER_ASSERT(reporter, NULL != layer->texture()); REPORTER_ASSERT(reporter, layer->isAtlased()); } else if (4 == i) { -#endif // The one that was never atlased should still be around REPORTER_ASSERT(reporter, NULL != layer); REPORTER_ASSERT(reporter, NULL == layer->texture()); REPORTER_ASSERT(reporter, !layer->isAtlased()); -#if USE_ATLAS } else { // The one bumped out of the atlas (i.e., 0) should be gone REPORTER_ASSERT(reporter, NULL == layer); } -#endif } //-------------------------------------------------------------------- |