From fcc1a0973f91f0daff9c5c2d0a00208ecb7b91c2 Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 26 Sep 2022 12:58:29 -0700 Subject: Use d3d12/vk debug layer when gfx debug layer is enabled. (#2411) * Use d3d12/vk debug layer when gfx debug layer is enabled. * Fix. Co-authored-by: Yong He --- tools/gfx/d3d12/d3d12-device.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tools/gfx/d3d12/d3d12-device.cpp') diff --git a/tools/gfx/d3d12/d3d12-device.cpp b/tools/gfx/d3d12/d3d12-device.cpp index efc1beb22..e682764f5 100644 --- a/tools/gfx/d3d12/d3d12-device.cpp +++ b/tools/gfx/d3d12/d3d12-device.cpp @@ -471,12 +471,15 @@ Result DeviceImpl::initialize(const Desc& desc) // TODO: we should probably provide a command-line option // to override UseDebug of default rather than leave it // up to each back-end to specify. -#if ENABLE_DEBUG_LAYER - combiner.add( - DeviceCheckFlag::UseDebug, ChangeType::OnOff); ///< First try debug then non debug -#else - combiner.add(DeviceCheckFlag::UseDebug, ChangeType::Off); ///< Don't bother with debug -#endif + if (ENABLE_DEBUG_LAYER || isGfxDebugLayerEnabled()) + { + combiner.add( + DeviceCheckFlag::UseDebug, ChangeType::OnOff); ///< First try debug then non debug + } + else + { + combiner.add(DeviceCheckFlag::UseDebug, ChangeType::Off); ///< Don't bother with debug + } combiner.add( DeviceCheckFlag::UseHardwareDevice, ChangeType::OnOff); ///< First try hardware, then reference -- cgit v1.2.3