diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-27 08:06:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-27 08:06:41 +0200 |
| commit | 3c69ee0f05e7c96938c8b2fd70f122cbaf07232a (patch) | |
| tree | ac7b7629ac99702f4c67981c83aad36355c91c04 /src/plugins | |
| parent | 31a2cbbbc2dcf7d87a4b90c90c193e09e9676d6c (diff) | |
| parent | 018cd6d70f18762d20cc501ac352fa5f94eb7f66 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaf83f4c74b25b08764005267713db91c95732fc0
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp index 900dfe7ef7..2644c693ce 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp @@ -737,9 +737,13 @@ void QSGD3D12EnginePrivate::initialize(WId w, const QSize &size, float dpr, int const bool debugLayer = qEnvironmentVariableIntValue("QT_D3D_DEBUG") != 0; if (debugLayer) { qCDebug(QSG_LOG_INFO_GENERAL, "Enabling debug layer"); +#if !defined(Q_OS_WINRT) || !defined(NDEBUG) ComPtr<ID3D12Debug> debugController; if (SUCCEEDED(D3D12GetDebugInterface(IID_PPV_ARGS(&debugController)))) debugController->EnableDebugLayer(); +#else + qCDebug(QSG_LOG_INFO_GENERAL, "Using DebugInterface will not allow certification to pass"); +#endif } QSGD3D12DeviceManager *dev = deviceManager(); |