diff --git a/.pick_status.json b/.pick_status.json index e3190d5a04d..95bb19934a4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1164,7 +1164,7 @@ "description": "vulkan: explicitly cast object-type enum", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "41318a58196d385ce97041e16a055baf892e38cb" }, { diff --git a/src/vulkan/runtime/vk_debug_report.c b/src/vulkan/runtime/vk_debug_report.c index db89e3d6f5d..ea9aebf5930 100644 --- a/src/vulkan/runtime/vk_debug_report.c +++ b/src/vulkan/runtime/vk_debug_report.c @@ -150,8 +150,9 @@ vk_debug_report(struct vk_instance *instance, const char* pLayerPrefix, const char *pMessage) { - VkDebugReportObjectTypeEXT object_type = + VkObjectType object_type = object ? object->type : VK_OBJECT_TYPE_UNKNOWN; - debug_report(instance, flags, object_type, (uint64_t)(uintptr_t)object, - location, messageCode, pLayerPrefix, pMessage); + debug_report(instance, flags, (VkDebugReportObjectTypeEXT)object_type, + (uint64_t)(uintptr_t)object, location, messageCode, + pLayerPrefix, pMessage); }