Fix build

This commit is contained in:
Wojtek Figat
2023-07-19 09:08:17 +02:00
parent b26b9302e0
commit 32d9067710
5 changed files with 22 additions and 20 deletions

View File

@@ -460,10 +460,12 @@ GPUSwapChainVulkan::Status GPUSwapChainVulkan::Present(QueueVulkan* presentQueue
{
return Status::LostSurface;
}
#if GPU_ENABLE_ASSERTION
if (presentResult != VK_SUCCESS && presentResult != VK_SUBOPTIMAL_KHR)
{
VALIDATE_VULKAN_RESULT(presentResult);
}
#endif
return Status::Ok;
}

View File

@@ -205,6 +205,23 @@ void RenderToolsVulkan::SetObjectName(VkDevice device, uint64 objectHandle, VkOb
#endif
}
void RenderToolsVulkan::SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const char* name)
{
#if VK_EXT_debug_utils
// Check for valid function pointer (may not be present if not running in a debugging application)
if (vkSetDebugUtilsObjectNameEXT != nullptr && name != nullptr && *name != 0)
{
VkDebugUtilsObjectNameInfoEXT objectNameInfo;
ZeroStruct(objectNameInfo, VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT);
objectNameInfo.objectType = objectType;
objectNameInfo.objectHandle = objectHandle;
objectNameInfo.pObjectName = name;
const VkResult result = vkSetDebugUtilsObjectNameEXT(device, &objectNameInfo);
LOG_VULKAN_RESULT(result);
}
#endif
}
#endif
String RenderToolsVulkan::GetVkErrorString(VkResult result)

View File

@@ -43,26 +43,8 @@ private:
public:
#if GPU_ENABLE_RESOURCE_NAMING
static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const String& name);
static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const char* name)
{
#if VK_EXT_debug_utils
// Check for valid function pointer (may not be present if not running in a debugging application)
if (vkSetDebugUtilsObjectNameEXT != nullptr && name != nullptr && *name != 0)
{
VkDebugUtilsObjectNameInfoEXT objectNameInfo;
ZeroStruct(objectNameInfo, VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT);
objectNameInfo.objectType = objectType;
objectNameInfo.objectHandle = objectHandle;
objectNameInfo.pObjectName = name;
const VkResult result = vkSetDebugUtilsObjectNameEXT(device, &objectNameInfo);
LOG_VULKAN_RESULT(result);
}
#endif
}
static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const char* name);
#endif
static String GetVkErrorString(VkResult result);