aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ProxyTest.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-05-31 15:01:20 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-31 23:12:39 +0000
commit8bf1f9ffcf4b0168a1a05399eb0ed4e5e04eab80 (patch)
tree0bd70f825ee62563944dad12acdfe464c9818b89 /tests/ProxyTest.cpp
parent3f3075819f242158dcfc1690df5c15ba39c5dbb3 (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/ProxyTest.cpp')
-rw-r--r--tests/ProxyTest.cpp5
1 files changed, 5 insertions, 0 deletions
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