commit a9b211d202536cc3c82645d8fd457275076631cc
author Bryan Bernhart <bryan.bernhart@intel.com> Mon Mar 22 18:35:16 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Mar 22 18:35:16 2021 +0000
tree d08c8b43b535ffc785441acff9c4eafd237a250a
parent 3e4b57b77ea03dd9fd81b7777f2ea295d0cef1c0

D3D12: Prevent crash due to missing debug layer

Destroying the adapter without the debug layer installed
would crash the process upon access of the debug filters.

Bug: dawn:460
Change-Id: I04819c5136af780fd3b981857bd87d69d4abc9c7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/45560
Commit-Queue: Bryan Bernhart <bryan.bernhart@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn_native/d3d12/AdapterD3D12.cpp

diff --git a/src/dawn_native/d3d12/AdapterD3D12.cpp b/src/dawn_native/d3d12/AdapterD3D12.cpp
index 0fe3714..1455d12 100644
--- a/src/dawn_native/d3d12/AdapterD3D12.cpp
+++ b/src/dawn_native/d3d12/AdapterD3D12.cpp
@@ -191,8 +191,13 @@
         if (!GetInstance()->IsBackendValidationEnabled()) {
             return;
         }
+
+        // If the debug layer is not installed, return immediately to avoid crashing the process.
         ComPtr<ID3D12InfoQueue> infoQueue;
-        ASSERT_SUCCESS(mD3d12Device.As(&infoQueue));
+        if (FAILED(mD3d12Device.As(&infoQueue))) {
+            return;
+        }
+
         infoQueue->PopRetrievalFilter();
         infoQueue->PopStorageFilter();
     }