aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-05-03 17:25:48 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-08 11:49:54 +0000
commit555c49c3479edf1692579c06a5c13c39d3741692 (patch)
treea76d221433344f5093812f77e3a19f281e19dd98 /tests
parentba8ca0a12985f7c715cb69898fbc60956b65613d (diff)
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 <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/ProxyRefTest.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp
index 94c946db0a..d5569b41d1 100644
--- a/tests/ProxyRefTest.cpp
+++ b/tests/ProxyRefTest.cpp
@@ -47,8 +47,6 @@ 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,
@@ -193,5 +191,3 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) {
}
#endif
-
-#endif