commit 15bc24eeb8e3a6f71e60a4bdf8d73720bcb2c69d
author Austin Eng <enga@chromium.org> Wed Feb 16 17:32:20 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Feb 16 17:32:20 2022 +0000
tree 716285427c13e6a12c21b6720e3f468d52fcb14f
parent ac85af4a00dfac457475327eb393d00eb3ad8112

Don't try to load libvulkan on Mac

Only SwiftShader would be available on Mac.

Bug: chromium:1297154
Change-Id: I943a39dfdde4215ba0ea880bf08294f37f08ee42
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/80720
Reviewed-by: Shrek Shao <shrekshao@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>

src/dawn/native/vulkan/BackendVk.cpp

diff --git a/src/dawn/native/vulkan/BackendVk.cpp b/src/dawn/native/vulkan/BackendVk.cpp
index fb4555c..b7da247 100644
--- a/src/dawn/native/vulkan/BackendVk.cpp
+++ b/src/dawn/native/vulkan/BackendVk.cpp
@@ -407,6 +407,12 @@
 
         InstanceBase* instance = GetInstance();
         for (ICD icd : kICDs) {
+#if defined(DAWN_PLATFORM_MACOS)
+            // On Mac, we don't expect non-Swiftshader Vulkan to be available.
+            if (icd == ICD::None) {
+                continue;
+            }
+#endif  // defined(DAWN_PLATFORM_MACOS)
             if (options->forceSwiftShader && icd != ICD::SwiftShader) {
                 continue;
             }