From 89f333116e4e03c4e517920c261c8165e2999c0e Mon Sep 17 00:00:00 2001
From: Tex Riddell <texr@microsoft.com>
Date: Fri, 4 Mar 2022 09:10:41 -0800
Subject: [PATCH] Fix WARP/Basic Display Adapter detection for more scenarios.
 (#4309)

---
 tools/clang/unittests/HLSL/ExecutionTest.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/clang/unittests/HLSL/ExecutionTest.cpp b/tools/clang/unittests/HLSL/ExecutionTest.cpp
index e8b6a9b3a..1380dcf24 100644
--- a/tools/clang/unittests/HLSL/ExecutionTest.cpp
+++ b/tools/clang/unittests/HLSL/ExecutionTest.cpp
@@ -1167,7 +1167,9 @@ public:
     factory->EnumAdapterByLuid(adapterID, IID_PPV_ARGS(&adapter));
     DXGI_ADAPTER_DESC1 AdapterDesc;
     VERIFY_SUCCEEDED(adapter->GetDesc1(&AdapterDesc));
-    return (AdapterDesc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE);
+    return (AdapterDesc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE) ||
+           (AdapterDesc.VendorId == 0x1414 &&
+            (AdapterDesc.DeviceId == 0x8c || AdapterDesc.DeviceId == 0x8d));
   }
 
   bool DoesDeviceSupportInt64(ID3D12Device *pDevice) {