From c1f51124621275ffddf6bb55196755ce4ed3567e Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Mon, 12 Sep 2022 21:43:21 +0000 Subject: [PATCH] Remove code to set Vulkan backend debug labels This is hitting a memory corruption issue inside the NVIDIA driver. Speculatively delete the code in the Vulkan backend until further analysis finds the root cause. Bug: dawn:1539 Change-Id: Ie7bf5bed31976da5f13325c81033e787c4d376b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/102100 Reviewed-by: Loko Kung Kokoro: Kokoro Commit-Queue: Austin Eng --- src/dawn/native/vulkan/UtilsVulkan.cpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/dawn/native/vulkan/UtilsVulkan.cpp b/src/dawn/native/vulkan/UtilsVulkan.cpp index aa02ec35e5..b1ab45c1d0 100644 --- a/src/dawn/native/vulkan/UtilsVulkan.cpp +++ b/src/dawn/native/vulkan/UtilsVulkan.cpp @@ -209,28 +209,7 @@ void SetDebugNameInternal(Device* device, uint64_t objectHandle, const char* prefix, std::string label) { - if (!objectHandle) { - return; - } - - if (device->GetGlobalInfo().HasExt(InstanceExt::DebugUtils)) { - VkDebugUtilsObjectNameInfoEXT objectNameInfo; - objectNameInfo.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT; - objectNameInfo.pNext = nullptr; - objectNameInfo.objectType = objectType; - objectNameInfo.objectHandle = objectHandle; - - std::ostringstream objectNameStream; - // Prefix with the device's message ID so that if this label appears in a validation - // message it can be parsed out and the message can be associated with the right device. - objectNameStream << device->GetDebugPrefix() << kDeviceDebugSeparator << prefix; - if (!label.empty() && device->IsToggleEnabled(Toggle::UseUserDefinedLabelsInBackend)) { - objectNameStream << "_" << label; - } - std::string objectName = objectNameStream.str(); - objectNameInfo.pObjectName = objectName.c_str(); - device->fn.SetDebugUtilsObjectNameEXT(device->GetVkDevice(), &objectNameInfo); - } + // Implementation removed due to crbug.com/dawn/1539. } std::string GetNextDeviceDebugPrefix() {