commit b6e141afb88a42a8ea822f29367332ec10d69cd3
author Jiawei Shao <jiawei.shao@intel.com> Fri Nov 20 08:27:29 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Nov 20 08:27:29 2020 +0000
tree a54ec419a7cd8cf253a31bc294eeb819523ba45e
parent 1a14e7e0244114fe737caf46e3a2690355aceafe

D3D12: Search the default path of Windows SDK for DXC DLLs

This patch adds another way to get DXC DLLs (dxcompiler.dll and
dxil.dll) by searching the default installation path of Windows x64
SDK (C:\Program Files (x86)\Windows Kits\10\\bin\10.0.[version].0\x64)
so that now Dawn can find these two DLLs when Windows SDK is correctly
installed at the default location.

This patch also forces enabling the "use_dxc" toggle when Dawn can
find DXC DLLs and the device is created with "ShaderFloat16" extension
enabled because currently the HLSL shaders with float16_t can only be
compiled with DXC DLLs.

BUG=dawn:402

Change-Id: I410195d9e079f54faebbca71fff77a71f489f08e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/33180
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn_native/Device.cpp

diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp
index 5214564..0c493b6 100644
--- a/src/dawn_native/Device.cpp
+++ b/src/dawn_native/Device.cpp
@@ -1115,7 +1115,7 @@
     void DeviceBase::ForceSetToggle(Toggle toggle, bool isEnabled) {
         if (!mOverridenToggles.Has(toggle) && mEnabledToggles.Has(toggle) != isEnabled) {
             dawn::WarningLog() << "Forcing toggle \"" << ToggleEnumToName(toggle) << "\" to "
-                               << isEnabled << "when it was overriden to be " << !isEnabled;
+                               << isEnabled << " when it was overriden to be " << !isEnabled;
         }
         mEnabledToggles.Set(toggle, isEnabled);
     }