From 70607cb1602ffed9984daa0e2701f4208da1432a Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Wed, 15 Feb 2023 17:59:26 +0000 Subject: [PATCH] Refine d3d12 blocklist from X86 -> I386 This was wrong. DAWN_PLATFORM_IS_X86 is defined for both 32-bit and 64-bit X86 builds. Bug: dawn:1254 Change-Id: I308ac10749edcf76643539eb2801d019dd5439f9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/119900 Kokoro: Kokoro Commit-Queue: Corentin Wallez Reviewed-by: Corentin Wallez --- src/dawn/native/d3d12/AdapterD3D12.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dawn/native/d3d12/AdapterD3D12.cpp b/src/dawn/native/d3d12/AdapterD3D12.cpp index aa6492a272..2af5901309 100644 --- a/src/dawn/native/d3d12/AdapterD3D12.cpp +++ b/src/dawn/native/d3d12/AdapterD3D12.cpp @@ -100,9 +100,10 @@ MaybeError Adapter::InitializeImpl() { } if (GetInstance()->IsAdapterBlocklistEnabled()) { -#if DAWN_PLATFORM_IS(X86) - DAWN_INVALID_IF(mDeviceInfo.shaderModel >= 60, - "D3D12 x86 adapter is blocklisted. See https://crbug.com/tint/1753."); +#if DAWN_PLATFORM_IS(I386) + DAWN_INVALID_IF( + mDeviceInfo.shaderModel >= 60, + "D3D12 x86 SM6.0+ adapter is blocklisted. See https://crbug.com/tint/1753."); DAWN_INVALID_IF( gpu_info::IsNvidia(mVendorId),