aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-04-11 09:09:24 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-12 11:14:31 +0000
commit123b7b8ebd2f8abb7e3b2d498f299ae281b24b74 (patch)
tree2cbf0655227e1d2da1dc87c002100ccbd302bc74 /tests
parent8f30709e93ba377a0bf77f24aeae890d38b66e52 (diff)
Disable deferred proxies for Chrome branch
Chrome is branching again and Proxy instantiation is still occurring at a bad spot in Skia. Change-Id: I2f6bed7f1833737aa9bb7fd819ff108cffaeaf1d Reviewed-on: https://skia-review.googlesource.com/13133 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/ProxyRefTest.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp
index dc48ef0cf6..708c7b3034 100644
--- a/tests/ProxyRefTest.cpp
+++ b/tests/ProxyRefTest.cpp
@@ -47,6 +47,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