From 8bf1f9ffcf4b0168a1a05399eb0ed4e5e04eab80 Mon Sep 17 00:00:00 2001
From: Robert Phillips <robertphillips@google.com>
Date: Wed, 31 May 2017 15:01:20 -0400
Subject: 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>
---
 tests/DetermineDomainModeTest.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests/DetermineDomainModeTest.cpp')

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
-- 
cgit v1.2.3