diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-02 11:26:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 11:26:52 +0100 |
| commit | ae6b2d6edc76de347ccb11c4608b6e8174e1884f (patch) | |
| tree | 6f01d6a8b5d1d7bed58366fa644b5622fd53d8f4 /drivers/vulkan/vulkan_context.cpp | |
| parent | 122a27523da45d68b98e53dc5d6ca2b95f908ad1 (diff) | |
| parent | 7be7e87ff34a82a4474d6ff3658abdbb5e9e5d38 (diff) | |
Merge pull request #45657 from bruvzg/fix_macos_mkv_crash
Fix macOS Vulkan debug label crash.
Diffstat (limited to 'drivers/vulkan/vulkan_context.cpp')
| -rw-r--r-- | drivers/vulkan/vulkan_context.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/vulkan/vulkan_context.cpp b/drivers/vulkan/vulkan_context.cpp index 1a631f4a2c..98966477a5 100644 --- a/drivers/vulkan/vulkan_context.cpp +++ b/drivers/vulkan/vulkan_context.cpp @@ -331,7 +331,7 @@ Error VulkanContext::_create_physical_device() { * function to register the final callback. */ VkDebugUtilsMessengerCreateInfoEXT dbg_messenger_create_info; - if (use_validation_layers) { + if (enabled_debug_utils) { // VK_EXT_debug_utils style dbg_messenger_create_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT; dbg_messenger_create_info.pNext = nullptr; @@ -1593,7 +1593,8 @@ void VulkanContext::command_begin_label(VkCommandBuffer p_command_buffer, String VkDebugUtilsLabelEXT label; label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT; label.pNext = nullptr; - label.pLabelName = p_label_name.utf8().get_data(); + CharString label_name = p_label_name.utf8(); + label.pLabelName = label_name.get_data(); label.color[0] = p_color[0]; label.color[1] = p_color[1]; label.color[2] = p_color[2]; @@ -1608,7 +1609,8 @@ void VulkanContext::command_insert_label(VkCommandBuffer p_command_buffer, Strin VkDebugUtilsLabelEXT label; label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT; label.pNext = nullptr; - label.pLabelName = p_label_name.utf8().get_data(); + CharString label_name = p_label_name.utf8(); + label.pLabelName = label_name.get_data(); label.color[0] = p_color[0]; label.color[1] = p_color[1]; label.color[2] = p_color[2]; |