From 83c5028af6e7c421f2fe681b6b5de3fd10889893 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 16 Jul 2021 14:24:55 -0700 Subject: [PATCH] Fix windows release and a warning issued in Jenkins Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Editor/Clipboard.h | 3 +-- Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Code/Editor/Clipboard.h b/Code/Editor/Clipboard.h index ccca0db028..89744325c8 100644 --- a/Code/Editor/Clipboard.h +++ b/Code/Editor/Clipboard.h @@ -53,10 +53,9 @@ private: AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING static XmlNodeRef m_node; - AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING static QString m_title; - static QVariant s_pendingPut; + AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING QWidget* m_parent; QTimer m_putDebounce; diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp index 5e1462321f..0be2a76088 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp @@ -267,7 +267,7 @@ namespace AZ info.pImageIndices = &imageIndex; info.pResults = nullptr; - VkResult result = vkQueuePresentKHR(vulkanQueue->GetNativeQueue(), &info); + [[maybe_unused]] VkResult result = vkQueuePresentKHR(vulkanQueue->GetNativeQueue(), &info); // Resizing window cause recreation of SwapChain after calling this method, // so VK_SUBOPTIMAL_KHR or VK_ERROR_OUT_OF_DATE_KHR should not happen at this point.