diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-28 16:30:28 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-01 12:30:02 +0000 |
| commit | 7928e768728fe7eef9345345c74e810435dd3eac (patch) | |
| tree | eb8affc9a0ae51f3017ab058f9dd85556a54c1c1 /tests/ProxyRefTest.cpp | |
| parent | c61abeed8958a757c6b49937f28b63066148dd67 (diff) | |
Disable deferred gpu resources for Chrome branch
Chrome's branch is coming up and it seems unlikely that I will be able to push instantiation all the way to flush time (where failure will be easier to deal with) before then. This CL should silence the P1 bug but could introduce layout test diffs.
Ideally this wouldn't land until after: https://codereview.chromium.org/2718353004/ (Add flag for upcoming Skia change) so the layout test differences will be visible on the DEPS roll
BUG=688811
Change-Id: I86c42ee02e6672834353aa7126b00ed4f3521948
Reviewed-on: https://skia-review.googlesource.com/9064
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/ProxyRefTest.cpp')
| -rw-r--r-- | tests/ProxyRefTest.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index 6cd4cb0b0e..3a72acb9f1 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -15,8 +15,6 @@ #include "GrRenderTargetPriv.h" #include "GrRenderTargetProxy.h" -static const int kWidthHeight = 128; - int32_t GrIORefProxy::getProxyRefCnt_TestOnly() const { return fRefCnt; } @@ -47,6 +45,10 @@ 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, GrSurfaceProxy* proxy, int32_t expectedProxyRefs, @@ -71,7 +73,8 @@ static sk_sp<GrSurfaceProxy> make_deferred(const GrCaps& caps, GrTextureProvider desc.fHeight = kWidthHeight; desc.fConfig = kRGBA_8888_GrPixelConfig; - return GrSurfaceProxy::MakeDeferred(caps, desc, SkBackingFit::kApprox, SkBudgeted::kYes); + return GrSurfaceProxy::MakeDeferred(provider, caps, desc, + SkBackingFit::kApprox, SkBudgeted::kYes); } static sk_sp<GrSurfaceProxy> make_wrapped(const GrCaps& caps, GrTextureProvider* provider) { @@ -203,5 +206,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { } } } +#endif #endif |