summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2020-11-03 08:28:11 -0600
committerGitHub <noreply@github.com>2020-11-03 08:28:11 -0600
commitd2f80a45954d1c638af44b346223d4f480ce4e82 (patch)
tree5a86688fd7a1e5447641c5455836a940886068f8 /Source/Core/VideoBackends
parentd5c0a9a185afb4ee5d3ebe1140099bcb5cc65f83 (diff)
parentd456e2e391134742c633b0029251f7ca06bb5204 (diff)
Merge pull request #9138 from martymac/VK_NULL_HANDLE-fix
Fix build on FreeBSD i386 - nullptr vs VK_NULL_HANDLE
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/Vulkan/VKTexture.cpp2
-rw-r--r--Source/Core/VideoBackends/Vulkan/VKTexture.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
index fcff0db404..80c0c4aa86 100644
--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+++ b/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 a/Source/Core/VideoBackends/Vulkan/VKTexture.h b/Source/Core/VideoBackends/Vulkan/VKTexture.h
index 91d3e54eac..3b803dd4da 100644
--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h
+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h
@@ -54,7 +54,7 @@ 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>