From 05814de6ba5087ad71f189d6413246ef1d518e4b Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 8 May 2017 15:18:47 +0000 Subject: Revert "Re-enable deferred proxies in Chrome" This reverts commit 555c49c3479edf1692579c06a5c13c39d3741692. Reason for revert: layout tests Original change's description: > Re-enable deferred proxies in Chrome > > Now that https://skia-review.googlesource.com/c/14605/ (Allow TextureSamplers to have null GrTexture pointer) has landed we should be able to re-enable deferred proxies in Chrome. > > Bug: 715488 > Change-Id: Ibd38e5ddf0558b94f09e29f17837e6abfd22fa34 > Reviewed-on: https://skia-review.googlesource.com/15252 > Reviewed-by: Brian Salomon > Commit-Queue: Robert Phillips > TBR=bsalomon@google.com,robertphillips@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ie90e64a2e4d5efc4b6909a04f8a862dd3a708d97 Reviewed-on: https://skia-review.googlesource.com/15809 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- tests/ProxyRefTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/ProxyRefTest.cpp') diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index d5569b41d1..94c946db0a 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, @@ -191,3 +193,5 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { } #endif + +#endif -- cgit v1.2.3