diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-31 15:01:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-31 23:12:39 +0000 |
| commit | 8bf1f9ffcf4b0168a1a05399eb0ed4e5e04eab80 (patch) | |
| tree | 0bd70f825ee62563944dad12acdfe464c9818b89 /tests | |
| parent | 3f3075819f242158dcfc1690df5c15ba39c5dbb3 (diff) | |
Disable deferred proxies for M60 branch
Bug: 720325
Change-Id: I0529bbcd592bdc5d5a741731af8a66971e485649
Reviewed-on: https://skia-review.googlesource.com/18239
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DetermineDomainModeTest.cpp | 4 | ||||
| -rw-r--r-- | tests/ProxyRefTest.cpp | 4 | ||||
| -rw-r--r-- | tests/ProxyTest.cpp | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tests/DetermineDomainModeTest.cpp b/tests/DetermineDomainModeTest.cpp index add746fec5..1ce38d34b9 100644 --- a/tests/DetermineDomainModeTest.cpp +++ b/tests/DetermineDomainModeTest.cpp @@ -341,6 +341,8 @@ static const SkRect* no_inset(const RectInfo& enclosing, insetAmount, halfFilterWidth, 0, name); } +#ifndef SK_DISABLE_DEFERRED_PROXIES + static void proxy_test(skiatest::Reporter* reporter, GrResourceProvider* resourceProvider) { GrTextureProducer_TestAccess::DomainMode actualMode, expectedMode; SkRect actualDomainRect; @@ -444,3 +446,5 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DetermineDomainModeTest, reporter, ctxInfo) { } #endif + +#endif diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index cd07e186c8..0775fde3e8 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -45,6 +45,8 @@ int32_t GrIORefProxy::getPendingWriteCnt_TestOnly() const { return fPendingWrites; } +#ifndef SK_DISABLE_DEFERRED_PROXIES + static const int kWidthHeight = 128; static void check_refs(skiatest::Reporter* reporter, @@ -189,3 +191,5 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { } #endif + +#endif diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 1799a75e52..40cbeebdc7 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -10,6 +10,9 @@ #include "Test.h" #if SK_SUPPORT_GPU + +#ifndef SK_DISABLE_DEFERRED_PROXIES + #include "GrBackendSurface.h" #include "GrRenderTargetPriv.h" #include "GrRenderTargetProxy.h" @@ -307,3 +310,5 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ZeroSizedProxyTest, reporter, ctxInfo) { } #endif + +#endif |