From bc93cbc2a21cde684726f6c34f4448c8eeca4283 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Mon, 29 Aug 2022 16:38:39 +0000 Subject: [PATCH] Correctly print backend type in DiscoverAdapters logs. Bug: chromium:1348664 Change-Id: Id2eaf25a9f46b1f6614d80642dc7f8e8aef09b9e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/100520 Auto-Submit: Corentin Wallez Reviewed-by: Austin Eng Commit-Queue: Austin Eng --- src/dawn/native/Instance.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dawn/native/Instance.cpp b/src/dawn/native/Instance.cpp index a582199665..78afd8ed8e 100644 --- a/src/dawn/native/Instance.cpp +++ b/src/dawn/native/Instance.cpp @@ -194,9 +194,9 @@ ResultOrError> InstanceBase::RequestAdapterInternal( MaybeError result = DiscoverAdaptersInternal(&vulkanOptions); if (result.IsError()) { - dawn::WarningLog() - << "Skipping Vulkan Swiftshader adapter because initialization failed: " - << result.AcquireError()->GetFormattedMessage(); + dawn::WarningLog() << absl::StrFormat( + "Skipping Vulkan Swiftshader adapter because initialization failed: %s", + result.AcquireError()->GetFormattedMessage()); return Ref(nullptr); } } @@ -297,9 +297,9 @@ bool InstanceBase::DiscoverAdapters(const AdapterDiscoveryOptionsBase* options) MaybeError result = DiscoverAdaptersInternal(options); if (result.IsError()) { - dawn::WarningLog() << "Skipping " << options->backendType - << " adapter because initialization failed: " - << result.AcquireError()->GetFormattedMessage(); + dawn::WarningLog() << absl::StrFormat( + "Skipping %s adapter because initialization failed: %s", FromAPI(options->backendType), + result.AcquireError()->GetFormattedMessage()); return false; }