From 799c52463eb7987d31c70430422fa1499f2b3ef9 Mon Sep 17 00:00:00 2001 From: Silent Date: Sun, 21 Jul 2019 00:17:15 +0200 Subject: [PATCH] Fixes for WRL usage - QueryInterface is explicitly mentioned as not to be used with WRL ComPtr --- Source/Core/VideoBackends/D3D/D3DBase.cpp | 6 +++--- Source/Core/VideoBackends/D3D12/DXContext.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp index ab3ea9321c..60e675293c 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp @@ -81,10 +81,10 @@ bool Create(u32 adapter_index, bool enable_debug_layer) D3D11_SDK_VERSION, &device, &feature_level, &context); // Debugbreak on D3D error - if (SUCCEEDED(hr) && SUCCEEDED(device->QueryInterface(IID_PPV_ARGS(&s_debug)))) + if (SUCCEEDED(hr) && SUCCEEDED(device.As(&s_debug))) { ComPtr info_queue; - if (SUCCEEDED(s_debug->QueryInterface(IID_PPV_ARGS(&info_queue)))) + if (SUCCEEDED(s_debug.As(&info_queue))) { info_queue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, true); info_queue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, true); @@ -121,7 +121,7 @@ bool Create(u32 adapter_index, bool enable_debug_layer) return false; } - hr = device->QueryInterface(IID_PPV_ARGS(&device1)); + hr = device.As(&device1); if (FAILED(hr)) { WARN_LOG(VIDEO, "Missing Direct3D 11.1 support. Logical operations will not be supported."); diff --git a/Source/Core/VideoBackends/D3D12/DXContext.cpp b/Source/Core/VideoBackends/D3D12/DXContext.cpp index 63eb4dca51..6793c915e0 100644 --- a/Source/Core/VideoBackends/D3D12/DXContext.cpp +++ b/Source/Core/VideoBackends/D3D12/DXContext.cpp @@ -180,7 +180,7 @@ bool DXContext::CreateDevice(u32 adapter_index, bool enable_debug_layer) if (enable_debug_layer) { ComPtr info_queue; - if (SUCCEEDED(m_device->QueryInterface(IID_PPV_ARGS(&info_queue)))) + if (SUCCEEDED(m_device.As(&info_queue))) { info_queue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_ERROR, TRUE); info_queue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_WARNING, TRUE);