cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import upstream patch to fix build on i386:

Browse Source 
/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; }
                                  ~~~~~~~~~~~~~~~ ^  ~~~~~~~
This commit is contained in:
Ganael LAPLANCHE 2020-11-03 20:12:36 +00:00
parent 33f826b3e9
commit 907382ed49
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=554027
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
emulators/dolphin-emu/files/patch-d456e2e.txt Normal file
View File

@ -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>