From fd41c9cd5708b392e5e4b89d013b908a30a6c1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 9 Aug 2020 10:28:37 +0200 Subject: [PATCH] These convenience overloads don't work in 32-bit builds, remove them. --- Common/Vulkan/VulkanContext.h | 11 ----------- Common/Vulkan/VulkanImage.cpp | 2 +- ext/native/thin3d/VulkanRenderManager.cpp | 2 +- ext/native/thin3d/VulkanRenderManager.h | 4 ++-- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Common/Vulkan/VulkanContext.h b/Common/Vulkan/VulkanContext.h index a10692b88f..7c9174f38f 100644 --- a/Common/Vulkan/VulkanContext.h +++ b/Common/Vulkan/VulkanContext.h @@ -175,17 +175,6 @@ public: } } - // Shorthand for the above, the most common types we want to tag. - void SetDebugName(VkImage image, const char *name) { - SetDebugName(image, VK_OBJECT_TYPE_IMAGE, name); - } - void SetDebugName(VkFramebuffer framebuf, const char *name) { - SetDebugName(framebuf, VK_OBJECT_TYPE_FRAMEBUFFER, name); - } - void SetDebugName(VkSampler sampler, const char *name) { - SetDebugName(sampler, VK_OBJECT_TYPE_SAMPLER, name); - } - bool MemoryTypeFromProperties(uint32_t typeBits, VkFlags requirements_mask, uint32_t *typeIndex); VkPhysicalDevice GetPhysicalDevice(int n) const { diff --git a/Common/Vulkan/VulkanImage.cpp b/Common/Vulkan/VulkanImage.cpp index 1d9b8d7ffe..247df10ff9 100644 --- a/Common/Vulkan/VulkanImage.cpp +++ b/Common/Vulkan/VulkanImage.cpp @@ -72,7 +72,7 @@ bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, VulkanDeviceAllocator *all } // Apply the tag - vulkan_->SetDebugName(image_, tag_.c_str()); + vulkan_ ->SetDebugName(image_, VK_OBJECT_TYPE_IMAGE, tag_.c_str()); VkMemoryRequirements mem_reqs{}; bool dedicatedAllocation = false; diff --git a/ext/native/thin3d/VulkanRenderManager.cpp b/ext/native/thin3d/VulkanRenderManager.cpp index 01e692de59..a56a357cc7 100644 --- a/ext/native/thin3d/VulkanRenderManager.cpp +++ b/ext/native/thin3d/VulkanRenderManager.cpp @@ -718,7 +718,7 @@ bool VulkanRenderManager::InitDepthStencilBuffer(VkCommandBuffer cmd) { if (res != VK_SUCCESS) return false; - vulkan_->SetDebugName(depth_.image, "BackbufferDepth"); + vulkan_->SetDebugName(depth_.image, VK_OBJECT_TYPE_IMAGE, "BackbufferDepth"); bool dedicatedAllocation = false; VkMemoryRequirements mem_reqs; diff --git a/ext/native/thin3d/VulkanRenderManager.h b/ext/native/thin3d/VulkanRenderManager.h index 0122dc488e..6113132980 100644 --- a/ext/native/thin3d/VulkanRenderManager.h +++ b/ext/native/thin3d/VulkanRenderManager.h @@ -52,8 +52,8 @@ public: vkCreateFramebuffer(vulkan_->GetDevice(), &fbci, nullptr, &framebuf); if (vk->Extensions().EXT_debug_utils) { - vk->SetDebugName(color.image, StringFromFormat("fb_color_%s", tag).c_str()); - vk->SetDebugName(depth.image, StringFromFormat("fb_depth_%s", tag).c_str()); + vk->SetDebugName(color.image, VK_OBJECT_TYPE_IMAGE, StringFromFormat("fb_color_%s", tag).c_str()); + vk->SetDebugName(depth.image, VK_OBJECT_TYPE_IMAGE, StringFromFormat("fb_depth_%s", tag).c_str()); vk->SetDebugName(framebuf, VK_OBJECT_TYPE_FRAMEBUFFER, StringFromFormat("fb_%s", tag).c_str()); } }