Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports-gnome
 Path: blob/main/emulators/dolphin-emu/files/patch-d456e2e.txt
16126 views
1
commit d456e2e391134742c633b0029251f7ca06bb5204

2
Author: Ganael Laplanche <[email protected]>

3
Date:   Wed Oct 7 21:25:29 2020 +0200

4


5
    Resolve VkDeviceMemory/nullptr type mismatch to fix build on FreeBSD i386

6


7
--- Source/Core/VideoBackends/Vulkan/VKTexture.cpp.orig	2020-09-30 21:42:30 UTC

8
+++ Source/Core/VideoBackends/Vulkan/VKTexture.cpp

9
@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(co

10
                                                     VkImageViewType view_type, VkImageLayout layout)

11
 {

12
   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(

13
-      tex_config, nullptr, image, layout, ComputeImageLayout::Undefined);

14
+      tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined);

15
   if (!texture->CreateView(view_type))

16
     return nullptr;

17
 

18
--- Source/Core/VideoBackends/Vulkan/VKTexture.h.orig	2020-09-30 21:42:30 UTC

19
+++ Source/Core/VideoBackends/Vulkan/VKTexture.h

20
@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture (public

21
   VkImageView GetView() const { return m_view; }

22
   VkImageLayout GetLayout() const { return m_layout; }

23
   VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); }

24
-  bool IsAdopted() const { return m_device_memory != nullptr; }

25
+  bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); }

26
 

27
   static std::unique_ptr<VKTexture> Create(const TextureConfig& tex_config);

28
   static std::unique_ptr<VKTexture>

29


30