Date: Tue, 3 Nov 2020 20:12:36 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554027 - head/emulators/dolphin-emu/files Message-ID: <202011032012.0A3KCaSx051183@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Tue Nov 3 20:12:36 2020 New Revision: 554027 URL: https://svnweb.freebsd.org/changeset/ports/554027 Log: 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; } ~~~~~~~~~~~~~~~ ^ ~~~~~~~ Added: head/emulators/dolphin-emu/files/patch-d456e2e.txt (contents, props changed) Added: head/emulators/dolphin-emu/files/patch-d456e2e.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/dolphin-emu/files/patch-d456e2e.txt Tue Nov 3 20:12:36 2020 (r554027) @@ -0,0 +1,28 @@ +commit d456e2e391134742c633b0029251f7ca06bb5204 +Author: Ganael Laplanche <ganael.laplanche@martymac.org> +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> VKTexture::CreateAdopted(co + VkImageViewType view_type, VkImageLayout layout) + { + std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>( +- 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<VKTexture> Create(const TextureConfig& tex_config); + static std::unique_ptr<VKTexture>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011032012.0A3KCaSx051183>