diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-10-04 08:42:28 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-04 15:42:22 +0000 |
| commit | fa8c08044989fa6f845463ed893c1b8c38620cf0 (patch) | |
| tree | d8d7c777f5d23c8a6567cf5c5cb409515a47e7d0 /tests/TextureProxyTest.cpp | |
| parent | 490847e20902a641319c1d4ed4b5e7469040f639 (diff) | |
Use SK_DISABLE_DEFERRED_PROXIES to only disable deferred proxies for Chrome
This relies on https://chromium-review.googlesource.com/c/chromium/src/+/700475 (Readd SK_DISABLE_DEFERRED_PROXIES flag) landing in Chrome first.
It refines the changes made in: https://skia-review.googlesource.com/c/skia/+/54004 (Temporarily disable deferred texture proxies)
Change-Id: I12af50349516d32f74cd7f7dfd25a668284f64fa
Reviewed-on: https://skia-review.googlesource.com/55100
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/TextureProxyTest.cpp')
| -rw-r--r-- | tests/TextureProxyTest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp index c4493904c0..d2277890c2 100644 --- a/tests/TextureProxyTest.cpp +++ b/tests/TextureProxyTest.cpp @@ -254,7 +254,7 @@ static void invalidation_test(GrContext* context, skiatest::Reporter* reporter) REPORTER_ASSERT(reporter, 0 == cache->getResourceCount()); } -#if 0 +#ifndef SK_DISABLE_DEFERRED_PROXIES // Test if invalidating unique ids prior to instantiating operates as expected static void invalidation_and_instantiation_test(GrContext* context, skiatest::Reporter* reporter) { GrResourceProvider* provider = context->resourceProvider(); @@ -318,7 +318,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(TextureProxyTest, reporter, ctxInfo) { } invalidation_test(context, reporter); - //invalidation_and_instantiation_test(context, reporter); +#ifndef SK_DISABLE_DEFERRED_PROXIES + invalidation_and_instantiation_test(context, reporter); +#endif } #endif |