diff options
Diffstat (limited to 'tools/gfx/d3d12/d3d12-device.cpp')
| -rw-r--r-- | tools/gfx/d3d12/d3d12-device.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/tools/gfx/d3d12/d3d12-device.cpp b/tools/gfx/d3d12/d3d12-device.cpp index 88051d837..cfb384787 100644 --- a/tools/gfx/d3d12/d3d12-device.cpp +++ b/tools/gfx/d3d12/d3d12-device.cpp @@ -17,12 +17,6 @@ #include "d3d12-swap-chain.h" #include "d3d12-vertex-layout.h" -#ifdef _DEBUG -#define ENABLE_DEBUG_LAYER 1 -#else -#define ENABLE_DEBUG_LAYER 0 -#endif - #ifdef GFX_NVAPI #include "../nvapi/nvapi-include.h" #endif @@ -534,7 +528,7 @@ Result DeviceImpl::initialize(const Desc& desc) // If Aftermath is enabled, we can't enable the D3D12 debug layer as well - if (ENABLE_DEBUG_LAYER || isGfxDebugLayerEnabled() && !g_isAftermathEnabled) + if (isGfxDebugLayerEnabled() && !g_isAftermathEnabled) { m_D3D12GetDebugInterface = (PFN_D3D12_GET_DEBUG_INTERFACE)loadProc(d3dModule, "D3D12GetDebugInterface"); @@ -569,10 +563,7 @@ Result DeviceImpl::initialize(const Desc& desc) if (desc.existingDeviceHandles.handles[0].handleValue == 0) { FlagCombiner combiner; - // 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 || isGfxDebugLayerEnabled()) + if (isGfxDebugLayerEnabled()) { combiner.add( DeviceCheckFlag::UseDebug, |