jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dolphin-emu: enable on i686

Browse source
This commit is contained in:
Piotr Wójcik 2021-03-24 01:47:35 +01:00 committed by Piotr
parent bb824210e4
commit d76250b59f
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch Normal file
View file

@ -0,0 +1,37 @@
From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
From: Ganael Laplanche <ganael.laplanche@martymac.org>
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
--- Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+++ Source/Core/VideoBackends/Vulkan/VKTexture.cpp
@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
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;
diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h
index 91d3e54eac2..3b803dd4da4 100644
--- Source/Core/VideoBackends/Vulkan/VKTexture.h
+++ 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<VKTexture> Create(const TextureConfig& tex_config);
static std::unique_ptr<VKTexture>

2
srcpkgs/dolphin-emu/template
View file

@ -4,7 +4,7 @@ version=5.0.13178
revision=1 revision=1
_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333 _commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
#Version/hash pair can be found at https://dolphin-emu.org/download/ #Version/hash pair can be found at https://dolphin-emu.org/download/
archs="x86_64* aarch64* ppc64le*" archs="x86_64* aarch64* ppc64le* i686*"
wrksrc="dolphin-${_commit}" wrksrc="dolphin-${_commit}"
build_style=cmake build_style=cmake
configure_args="-DUSE_SHARED_ENET=ON" configure_args="-DUSE_SHARED_ENET=ON"