From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001 From: Ganael Laplanche Date: Wed, 7 Oct 2020 21:25:29 +0200 Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on FreeBSD i386 --- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +- Source/Core/VideoBackends/Vulkan/VKTexture.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp index fcff0db4048..80c0c4aa86d 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -122,7 +122,7 @@ std::unique_ptr VKTexture::CreateAdopted(const TextureConfig& tex_con VkImageViewType view_type, VkImageLayout layout) { std::unique_ptr texture = std::make_unique( - tex_config, nullptr, image, layout, ComputeImageLayout::Undefined); + tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined); if (!texture->CreateView(view_type)) return nullptr; diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h index 91d3e54eac2..3b803dd4da4 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.h +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h @@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture VkImageView GetView() const { return m_view; } VkImageLayout GetLayout() const { return m_layout; } VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); } - bool IsAdopted() const { return m_device_memory != nullptr; } + bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); } static std::unique_ptr Create(const TextureConfig& tex_config); static std::unique_ptr