commit ba375a88843160e6884023e9108ea84de8eb3a0f
author Robert Phillips <robertphillips@google.com> Wed Apr 11 10:08:06 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 12 14:56:10 2018 +0000
tree 18dc34f015079a4ef7aedbc4d0fc877fa56d6d92
parent 21f6437764253c304c839409ea7883ad56cfcd63

Add SK_SUPPORT_LEGACY_BACKEND_OBJECTS

This relies on the Chrome CL: https://chromium-review.googlesource.com/c/chromium/src/+/999796 (Add SK_SUPPORT_LEGACY_BACKEND_OBJECTS to SkUserConfig.h) landing first.

Change-Id: Ie0a2b7b84cc02e46957765a0a7d6444a5320769d
Reviewed-on: https://skia-review.googlesource.com/119140
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

tests/SurfaceSemaphoreTest.cpp

diff --git a/tests/SurfaceSemaphoreTest.cpp b/tests/SurfaceSemaphoreTest.cpp
index eea6e37..980478b 100644
--- a/tests/SurfaceSemaphoreTest.cpp
+++ b/tests/SurfaceSemaphoreTest.cpp
@@ -63,13 +63,8 @@
 
 void draw_child(skiatest::Reporter* reporter,
                 const sk_gpu_test::ContextInfo& childInfo,
-                const GrBackendObject& backendImage,
+                const GrBackendTexture& backendTexture,
                 const GrBackendSemaphore& semaphore) {
-    GrBackendTexture backendTexture = GrTest::CreateBackendTexture(childInfo.backend(),
-                                                                   MAIN_W, MAIN_H,
-                                                                   kRGBA_8888_GrPixelConfig,
-                                                                   GrMipMapped::kNo,
-                                                                   backendImage);
 
     childInfo.testContext()->makeCurrent();
 
@@ -156,21 +151,22 @@
     }
 
     sk_sp<SkImage> mainImage = mainSurface->makeImageSnapshot();
-    GrBackendObject backendImage = mainImage->getTextureHandle(false);
+    GrBackendTexture backendTexture = mainImage->getBackendTexture(false);
 
-    draw_child(reporter, childInfo1, backendImage, semaphores[0]);
+    draw_child(reporter, childInfo1, backendTexture, semaphores[0]);
 
 #ifdef SK_VULKAN
     if (kVulkan_GrBackend == mainInfo.backend()) {
         // In Vulkan we need to make sure we are sending the correct VkImageLayout in with the
         // backendImage. After the first child draw the layout gets changed to SHADER_READ, so
         // we just manually set that here.
-        GrVkImageInfo* vkInfo = (GrVkImageInfo*)backendImage;
-        vkInfo->updateImageLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+        GrVkImageInfo vkInfo;
+        SkAssertResult(backendTexture.getVkImageInfo(&vkInfo));
+        vkInfo.updateImageLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
     }
 #endif
 
-    draw_child(reporter, childInfo2, backendImage, semaphores[1]);
+    draw_child(reporter, childInfo2, backendTexture, semaphores[1]);
 }
 
 DEF_GPUTEST(SurfaceSemaphores, reporter, options) {