commit 6db3a24c19e7580a0aaee7aff8a52c16489c6abe
author Bryan Bernhart <bryan.bernhart@intel.com> Tue Sep 22 16:23:06 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Sep 22 16:23:06 2020 +0000
tree 99277f3cde1840673c58132a654e63a880310435
parent 5b4e5fbe1f19c90356fd2802fb7c3e537a207547

Revert "Disable debug layer logger"

This reverts commit 52a588f3c9ba374630158cc045dfa311ed6a7584.

Reason for revert: added a workaround to filter out messages.

Original change's description:
> Disable debug layer logger
>
> This logger is producing too much output on Windows and causing
> Chromium's gtest harness to kill the tests.
>
> Tbr=cwallez@chromium.org
> No-Try: true
> Bug: chromium:1130483
> Change-Id: I1990bc800bbb7eda62901d14f656375c30fbeef2
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/28740
> Reviewed-by: Austin Eng <enga@chromium.org>
> Commit-Queue: Austin Eng <enga@chromium.org>

TBR=cwallez@chromium.org,enga@chromium.org

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

src/dawn_native/d3d12/AdapterD3D12.cpp

diff --git a/src/dawn_native/d3d12/AdapterD3D12.cpp b/src/dawn_native/d3d12/AdapterD3D12.cpp
index 364e6c13..f271e76 100644
--- a/src/dawn_native/d3d12/AdapterD3D12.cpp
+++ b/src/dawn_native/d3d12/AdapterD3D12.cpp
@@ -169,6 +169,11 @@
         ComPtr<ID3D12InfoQueue> infoQueue;
         ASSERT_SUCCESS(mD3d12Device.As(&infoQueue));
 
+        // To avoid flooding the console, a storage-filter is also used to
+        // prevent messages from getting logged.
+        DAWN_TRY(CheckHRESULT(infoQueue->PushStorageFilter(&filter),
+                              "ID3D12InfoQueue::PushStorageFilter"));
+
         DAWN_TRY(CheckHRESULT(infoQueue->PushRetrievalFilter(&filter),
                               "ID3D12InfoQueue::PushRetrievalFilter"));
 
@@ -182,6 +187,7 @@
         ComPtr<ID3D12InfoQueue> infoQueue;
         ASSERT_SUCCESS(mD3d12Device.As(&infoQueue));
         infoQueue->PopRetrievalFilter();
+        infoQueue->PopStorageFilter();
     }
 
     ResultOrError<DeviceBase*> Adapter::CreateDeviceImpl(const DeviceDescriptor* descriptor) {

src/tests/DawnTest.cpp

diff --git a/src/tests/DawnTest.cpp b/src/tests/DawnTest.cpp
index 4b9ad15..5873da8 100644
--- a/src/tests/DawnTest.cpp
+++ b/src/tests/DawnTest.cpp
@@ -187,6 +187,11 @@
 DawnTestEnvironment::DawnTestEnvironment(int argc, char** argv) {
     ParseArgs(argc, argv);
 
+    if (mEnableBackendValidation) {
+        mPlatformDebugLogger =
+            std::unique_ptr<utils::PlatformDebugLogger>(utils::CreatePlatformDebugLogger());
+    }
+
     // Create a temporary instance to select available and preferred adapters. This is done before
     // test instantiation so GetAvailableAdapterTestParamsForBackends can generate test
     // parameterizations all selected adapters. We drop the instance at the end of this function