diff options
author | Greg Daniel <egdaniel@google.com> | 2018-05-03 16:54:03 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-21 18:25:38 +0000 |
commit | 6d138bf681eee54a8b4a40e5dbbd08a137ae0d93 (patch) | |
tree | 7eb05a8c09ad212fc9a693296287f2b62b2f99f8 /tests | |
parent | be3c1d22c7d3e18cee9f1697827392e16b436df2 (diff) |
Reland "Remove GrBackendObject and all related functions from Skia."
This is a reland of ccd4cfc23ebbbecbc6b292359352aad335ad7b73
Original change's description:
> Remove GrBackendObject and all related functions from Skia.
>
> Bug: skia:
> Change-Id: I59434b7477c0bc26fd982bd81eb97ab94bbba073
> Reviewed-on: https://skia-review.googlesource.com/125822
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
Bug: skia:
Change-Id: Ibd1b9bd04b36840d9d872e2f0970dd6bac378bc9
Reviewed-on: https://skia-review.googlesource.com/129380
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/VkBackendSurfaceTest.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/VkBackendSurfaceTest.cpp b/tests/VkBackendSurfaceTest.cpp index 6b442a9725..3b3a9cec14 100644 --- a/tests/VkBackendSurfaceTest.cpp +++ b/tests/VkBackendSurfaceTest.cpp @@ -84,19 +84,6 @@ DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkImageLayoutTest, reporter, ctxInfo) { backendTexImage.setVkImageLayout(VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); REPORTER_ASSERT(reporter, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL == vkTexture->currentLayout()); -#ifdef SK_SUPPORT_LEGACY_BACKEND_OBJECTS - // Verify that modifying the layout via the old textureHandle sitll works in is reflected in the - // GrVkTexture and GrBackendTexture. - GrVkImageInfo* backendInfo = (GrVkImageInfo*)wrappedImage->getTextureHandle(false); - REPORTER_ASSERT(reporter, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL == backendInfo->fImageLayout); - - backendInfo->updateImageLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); - REPORTER_ASSERT(reporter, - VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL == vkTexture->currentLayout()); - REPORTER_ASSERT(reporter, backendTexImage.getVkImageInfo(&info)); - REPORTER_ASSERT(reporter, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL == info.fImageLayout); -#endif - vkTexture->updateImageLayout(initLayout); REPORTER_ASSERT(reporter, backendTex.getVkImageInfo(&info)); |