commit 65a706314250255c6d2584ca41473634bca44be0
author Shrek Shao <shrekshao@google.com> Fri Oct 11 00:57:49 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Oct 11 00:57:49 2024 +0000
tree d15883f1a37c82665d24e9bb2e2201e951739e1d
parent e564270fd655283793ee72874f51e80d4f55e958

[Compat] Fix forceFallbackAdapter priority over compatibilityMode

Part 1 fix in dawn repo.

Dawn should select fallback adapter when both forceFallbackAdapter
and compatibilityMode are set to true.

Bug: 42241025
Change-Id: I88aa0b0674fce31ebf0de35b098d265922702093
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/210314
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Shrek Shao <shrekshao@google.com>
Reviewed-by: Stephen White <senorblanco@chromium.org>

src/dawn/native/Instance.cpp

diff --git a/src/dawn/native/Instance.cpp b/src/dawn/native/Instance.cpp
index b8424c8..61ababb 100644
--- a/src/dawn/native/Instance.cpp
+++ b/src/dawn/native/Instance.cpp
@@ -370,8 +370,9 @@
     UnpackedPtr<RequestAdapterOptions> unpacked = Unpack(options);
     auto* togglesDesc = unpacked.Get<DawnTogglesDescriptor>();
 
-    FeatureLevel featureLevel =
-        options->compatibilityMode ? FeatureLevel::Compatibility : FeatureLevel::Core;
+    FeatureLevel featureLevel = (options->compatibilityMode && !options->forceFallbackAdapter)
+                                    ? FeatureLevel::Compatibility
+                                    : FeatureLevel::Core;
     std::vector<Ref<AdapterBase>> adapters;
     for (const auto& physicalDevice : EnumeratePhysicalDevices(unpacked)) {
         DAWN_ASSERT(physicalDevice->SupportsFeatureLevel(featureLevel));