Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

These convenience overloads don't work in 32-bit builds, remove them.

Browse source
This commit is contained in:
Henrik Rydgård 2020-08-09 10:28:37 +02:00
parent fbf6008a03
commit fd41c9cd57
4 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Common/Vulkan/VulkanContext.h
View file

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

2
Common/Vulkan/VulkanImage.cpp
View file

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

2
ext/native/thin3d/VulkanRenderManager.cpp
View file

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

4
ext/native/thin3d/VulkanRenderManager.h
View file

@ -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());
}
}