commit 0b791f57c4a158fa3cab7250f0955b7f8abd5755
author Brian Osman <brianosman@google.com> Fri Mar 10 08:30:22 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 10 15:41:38 2017 +0000
tree 1eca44123a954b3f8217db65bef4f4a1a7e21014
parent b726d58efc91c4eefa5cea0881a823ee108db8fd

Remove ownership aruments from render target wrap functions

We never adopt render targets (just borrow them).

BUG=skia:

Change-Id: Ie899b814a7a81339a8735bbd7ad9facc66e580d7
Reviewed-on: https://skia-review.googlesource.com/9525
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tests/VkWrapTests.cpp

diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp
index 58c4b35..7de3160 100644
--- a/tests/VkWrapTests.cpp
+++ b/tests/VkWrapTests.cpp
@@ -83,31 +83,21 @@
     desc.fSampleCnt = 0;
     desc.fStencilBits = 0;
     desc.fRenderTargetHandle = backendObj;
-    sk_sp<GrRenderTarget> rt = gpu->wrapBackendRenderTarget(desc, kBorrow_GrWrapOwnership);
+    sk_sp<GrRenderTarget> rt = gpu->wrapBackendRenderTarget(desc);
     REPORTER_ASSERT(reporter, rt);
 
     // image is null
     GrVkImageInfo backendCopy = *backendTex;
     backendCopy.fImage = VK_NULL_HANDLE;
     desc.fRenderTargetHandle = (GrBackendObject)&backendCopy;
-    rt = gpu->wrapBackendRenderTarget(desc, kBorrow_GrWrapOwnership);
-    REPORTER_ASSERT(reporter, !rt);
-    rt = gpu->wrapBackendRenderTarget(desc, kAdopt_GrWrapOwnership);
+    rt = gpu->wrapBackendRenderTarget(desc);
     REPORTER_ASSERT(reporter, !rt);
 
     // alloc is null
     backendCopy.fImage = backendTex->fImage;
     backendCopy.fAlloc = { VK_NULL_HANDLE, 0, 0, 0 };
-    // can wrap null alloc if borrowing
-    rt = gpu->wrapBackendRenderTarget(desc, kBorrow_GrWrapOwnership);
-    REPORTER_ASSERT(reporter, rt);
-    // but not if adopting
-    rt = gpu->wrapBackendRenderTarget(desc, kAdopt_GrWrapOwnership);
-    REPORTER_ASSERT(reporter, !rt);
-
-    // check adopt creation
-    backendCopy.fAlloc = backendTex->fAlloc;
-    rt = gpu->wrapBackendRenderTarget(desc, kAdopt_GrWrapOwnership);
+    // can wrap null alloc
+    rt = gpu->wrapBackendRenderTarget(desc);
     REPORTER_ASSERT(reporter, rt);
 
     gpu->deleteTestingOnlyBackendTexture(backendObj, true);