From 0b791f57c4a158fa3cab7250f0955b7f8abd5755 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Fri, 10 Mar 2017 08:30:22 -0500 Subject: 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 Commit-Queue: Brian Osman --- tests/VkWrapTests.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'tests/VkWrapTests.cpp') diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp index 58c4b356c6..7de31602f3 100644 --- a/tests/VkWrapTests.cpp +++ b/tests/VkWrapTests.cpp @@ -83,31 +83,21 @@ void wrap_rt_test(skiatest::Reporter* reporter, GrContext* context) { desc.fSampleCnt = 0; desc.fStencilBits = 0; desc.fRenderTargetHandle = backendObj; - sk_sp rt = gpu->wrapBackendRenderTarget(desc, kBorrow_GrWrapOwnership); + sk_sp 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); -- cgit v1.2.3