Vulkan: Wrap aquire semaphore in a vk::Scoped

If vkAcquireNextImageKHR fails, the aquireImageSemaphore would be leaked, wrap it in a vk::Scoped so it is always cleaned up. BUG=angleproject:2464 Change-Id: Ic4a0e16c89ea7c35cf060e5601760422e673c080 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1585318Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Vulkan: Wrap aquire semaphore in a vk::Scoped
28383fb2 · Geoff Lang · Commit Bot · 82133763 · 28383fb2
Commit 28383fb2 authored Apr 26, 2019 by Geoff Lang Committed by Commit Bot Apr 30, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

SurfaceVk.cpp src/libANGLE/renderer/vulkan/SurfaceVk.cpp +5 -5

No files found.
--- a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
@@ -827,17 +827,17 @@ angle::Result WindowSurfaceVk::nextSwapchainImage(DisplayVk *displayVk)
 {
    VkDevice device = displayVk->getDevice();
-    vk::Semaphore aquireImageSemaphore;
+    vk::Scoped<vk::Semaphore> aquireImageSemaphore(device);
-    ANGLE_VK_TRY(displayVk, aquireImageSemaphore.init(device));
+    ANGLE_VK_TRY(displayVk, aquireImageSemaphore.get().init(device));
    ANGLE_VK_TRY(displayVk, vkAcquireNextImageKHR(device, mSwapchain, UINT64_MAX,
-                                                  aquireImageSemaphore.getHandle(), VK_NULL_HANDLE,
+                                                  aquireImageSemaphore.get().getHandle(),
-                                                  &mCurrentSwapchainImageIndex));
+                                                  VK_NULL_HANDLE, &mCurrentSwapchainImageIndex));
    // After presenting, the flush semaphore chain is cleared. The semaphore returned by
    // vkAcquireNextImage will start a new chain.
    ASSERT(mFlushSemaphoreChain.empty());
-    mFlushSemaphoreChain.push_back(std::move(aquireImageSemaphore));
+    mFlushSemaphoreChain.push_back(aquireImageSemaphore.release());
    SwapchainImage &image = mSwapchainImages[mCurrentSwapchainImageIndex];