diff --git a/Common/Vulkan/VulkanImage.cpp b/Common/Vulkan/VulkanImage.cpp index 597907bb70..a7244d6dde 100644 --- a/Common/Vulkan/VulkanImage.cpp +++ b/Common/Vulkan/VulkanImage.cpp @@ -86,7 +86,7 @@ bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, int w, int h, int numMips, _assert_msg_(G3D, res != VK_ERROR_TOO_MANY_OBJECTS, "Too many Vulkan memory objects!"); _assert_(res == VK_ERROR_OUT_OF_HOST_MEMORY || res == VK_ERROR_OUT_OF_DEVICE_MEMORY || res == VK_ERROR_TOO_MANY_OBJECTS); vkDestroyImage(vulkan_->GetDevice(), image_, nullptr); - image_ = nullptr; + image_ = VK_NULL_HANDLE; return false; } diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 03363ef4c0..433b316997 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -80,7 +80,7 @@ void AsyncImageFileView::SetFilename(std::string filename) { void AsyncImageFileView::Draw(UIContext &dc) { using namespace Draw; if (!texture_ && !textureFailed_ && !filename_.empty()) { - texture_ = std::move(CreateTextureFromFile(dc.GetDrawContext(), filename_.c_str(), DETECT, true)); + texture_ = CreateTextureFromFile(dc.GetDrawContext(), filename_.c_str(), DETECT, true); if (!texture_.get()) textureFailed_ = true; } diff --git a/UI/TextureUtil.cpp b/UI/TextureUtil.cpp index 4855dd6e41..d934f956cf 100644 --- a/UI/TextureUtil.cpp +++ b/UI/TextureUtil.cpp @@ -161,7 +161,7 @@ std::unique_ptr CreateTextureFromFile(Draw::DrawContext *draw, c delete mtex; return std::unique_ptr(); } - return std::move(std::unique_ptr(mtex)); + return std::unique_ptr(mtex); } // TODO: Remove the code duplication between this and LoadFromFileData @@ -170,5 +170,5 @@ std::unique_ptr CreateTextureFromFileData(Draw::DrawContext *dra return std::unique_ptr(); ManagedTexture *mtex = new ManagedTexture(draw); mtex->LoadFromFileData(data, size, type, generateMips); - return std::move(std::unique_ptr(mtex)); + return std::unique_ptr(mtex); }