diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-14 14:39:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-14 21:23:44 +0000 |
| commit | 26c90e04797e15c37ec00e0f836292b8a207d294 (patch) | |
| tree | c5a86abbf8cfa796a87df49a157de0e12de18f87 /tests/ProxyRefTest.cpp | |
| parent | 97180af7f5e577a451367aa0c15cfaff1b6076f5 (diff) | |
Add GrRenderTargetContext::resourceProvider & GrResourceProvider::caps
and retract GrSurfaceContextPriv a bit
Change-Id: Id47af1052f9bda4fe7c85b3ce46b3ebe37797524
Reviewed-on: https://skia-review.googlesource.com/9647
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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index 612633c58c..ec47597b97 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -65,18 +65,18 @@ static void check_refs(skiatest::Reporter* reporter, SkASSERT(proxy->getPendingWriteCnt_TestOnly() == expectedNumWrites); } -static sk_sp<GrSurfaceProxy> make_deferred(const GrCaps& caps, GrResourceProvider* provider) { +static sk_sp<GrSurfaceProxy> make_deferred(GrResourceProvider* provider) { GrSurfaceDesc desc; desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fWidth = kWidthHeight; desc.fHeight = kWidthHeight; desc.fConfig = kRGBA_8888_GrPixelConfig; - return GrSurfaceProxy::MakeDeferred(provider, caps, desc, + return GrSurfaceProxy::MakeDeferred(provider, desc, SkBackingFit::kApprox, SkBudgeted::kYes); } -static sk_sp<GrSurfaceProxy> make_wrapped(const GrCaps& caps, GrResourceProvider* provider) { +static sk_sp<GrSurfaceProxy> make_wrapped(GrResourceProvider* provider) { GrSurfaceDesc desc; desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fWidth = kWidthHeight; @@ -100,7 +100,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { for (auto make : { make_deferred, make_wrapped }) { // A single write { - sk_sp<GrSurfaceProxy> sProxy((*make)(caps, provider)); + sk_sp<GrSurfaceProxy> sProxy((*make)(provider)); GrPendingIOResource<GrSurfaceProxy, kWrite_GrIOType> fWrite(sProxy.get()); @@ -120,7 +120,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { // A single read { - sk_sp<GrSurfaceProxy> sProxy((*make)(caps, provider)); + sk_sp<GrSurfaceProxy> sProxy((*make)(provider)); GrPendingIOResource<GrSurfaceProxy, kRead_GrIOType> fRead(sProxy.get()); @@ -140,7 +140,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { // A single read/write pair { - sk_sp<GrSurfaceProxy> sProxy((*make)(caps, provider)); + sk_sp<GrSurfaceProxy> sProxy((*make)(provider)); GrPendingIOResource<GrSurfaceProxy, kRW_GrIOType> fRW(sProxy.get()); @@ -160,7 +160,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { // Multiple normal refs { - sk_sp<GrSurfaceProxy> sProxy((*make)(caps, provider)); + sk_sp<GrSurfaceProxy> sProxy((*make)(provider)); sProxy->ref(); sProxy->ref(); @@ -181,7 +181,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) { // Continue using (reffing) proxy after instantiation { - sk_sp<GrSurfaceProxy> sProxy((*make)(caps, provider)); + sk_sp<GrSurfaceProxy> sProxy((*make)(provider)); sProxy->ref(); GrPendingIOResource<GrSurfaceProxy, kWrite_GrIOType> fWrite(sProxy.get()); |