From 2a10fa621123369791e14b0b056c4a3b7297d276 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Mon, 20 May 2024 11:03:10 -0700 Subject: [PATCH 1/2] [Impeller] Fix use-after-move in SwapchainVK. --- .../renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc | 2 +- .../renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h | 2 +- impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc index ad805a0a8cd72..2632c8d291417 100644 --- a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc +++ b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc @@ -19,7 +19,7 @@ bool AHBSwapchainVK::IsAvailableOnPlatform() { AHBSwapchainVK::AHBSwapchainVK(const std::shared_ptr& context, ANativeWindow* window, - vk::UniqueSurfaceKHR surface, + vk::UniqueSurfaceKHR& surface, const ISize& size, bool enable_msaa) : context_(context), diff --git a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h index a3b330f71cfc5..c702ab8ca2a7c 100644 --- a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h +++ b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h @@ -57,7 +57,7 @@ class AHBSwapchainVK final : public SwapchainVK { explicit AHBSwapchainVK(const std::shared_ptr& context, ANativeWindow* window, - vk::UniqueSurfaceKHR surface, + vk::UniqueSurfaceKHR& surface, const ISize& size, bool enable_msaa); }; diff --git a/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc b/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc index a2cb44509bb61..ce1951de8516a 100644 --- a/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc +++ b/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc @@ -67,7 +67,7 @@ std::shared_ptr SwapchainVK::Create( auto ahb_swapchain = std::shared_ptr(new AHBSwapchainVK( context, // window.GetHandle(), // - std::move(surface), // + surface, // window.GetSize(), // enable_msaa // )); From 742a3a3d614b898f5af945d08bf712adc394afb7 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Mon, 20 May 2024 11:39:59 -0700 Subject: [PATCH 2/2] const --- .../renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc | 2 +- .../renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc index 2632c8d291417..ddfdece798929 100644 --- a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc +++ b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.cc @@ -19,7 +19,7 @@ bool AHBSwapchainVK::IsAvailableOnPlatform() { AHBSwapchainVK::AHBSwapchainVK(const std::shared_ptr& context, ANativeWindow* window, - vk::UniqueSurfaceKHR& surface, + const vk::UniqueSurfaceKHR& surface, const ISize& size, bool enable_msaa) : context_(context), diff --git a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h index c702ab8ca2a7c..ddbcd13a52c95 100644 --- a/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h +++ b/impeller/renderer/backend/vulkan/swapchain/ahb/ahb_swapchain_vk.h @@ -57,7 +57,7 @@ class AHBSwapchainVK final : public SwapchainVK { explicit AHBSwapchainVK(const std::shared_ptr& context, ANativeWindow* window, - vk::UniqueSurfaceKHR& surface, + const vk::UniqueSurfaceKHR& surface, const ISize& size, bool enable_msaa); };