From 907382ed4904bc39c1f0a8b7ba3fb2f1b2da59db Mon Sep 17 00:00:00 2001 From: Ganael LAPLANCHE Date: Tue, 3 Nov 2020 20:12:36 +0000 Subject: [PATCH] Import upstream patch to fix build on i386: /wrkdirs/usr/ports/emulators/dolphin-emu/work/dolphin-3152428/Source/Core/VideoBackends/Vulkan/VKTexture.h:57:51: error: invalid operands to binary expression ('const VkDeviceMemory' (aka 'const unsigned long long') and 'nullptr_t') bool IsAdopted() const { return m_device_memory != nullptr; } ~~~~~~~~~~~~~~~ ^ ~~~~~~~ --- emulators/dolphin-emu/files/patch-d456e2e.txt | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 emulators/dolphin-emu/files/patch-d456e2e.txt diff --git a/emulators/dolphin-emu/files/patch-d456e2e.txt b/emulators/dolphin-emu/files/patch-d456e2e.txt new file mode 100644 index 000000000000..eb719288706d --- /dev/null +++ b/emulators/dolphin-emu/files/patch-d456e2e.txt @@ -0,0 +1,28 @@ +commit d456e2e391134742c633b0029251f7ca06bb5204 +Author: Ganael Laplanche +Date: Wed Oct 7 21:25:29 2020 +0200 + + Resolve VkDeviceMemory/nullptr type mismatch to fix build on FreeBSD i386 + +--- Source/Core/VideoBackends/Vulkan/VKTexture.cpp.orig 2020-09-30 21:42:30 UTC ++++ Source/Core/VideoBackends/Vulkan/VKTexture.cpp +@@ -122,7 +122,7 @@ std::unique_ptr VKTexture::CreateAdopted(co + 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; + +--- Source/Core/VideoBackends/Vulkan/VKTexture.h.orig 2020-09-30 21:42:30 UTC ++++ Source/Core/VideoBackends/Vulkan/VKTexture.h +@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture (public + 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