Skip to content
Permalink
Browse files

Fixes for WRL usage - QueryInterface is explicitly mentioned as not t…

…o be used with WRL ComPtr
  • Loading branch information...
CookiePLMonster committed Jul 20, 2019
1 parent 3c8f6bc commit 799c52463eb7987d31c70430422fa1499f2b3ef9
Showing with 4 additions and 4 deletions.
  1. +3 −3 Source/Core/VideoBackends/D3D/D3DBase.cpp
  2. +1 −1 Source/Core/VideoBackends/D3D12/DXContext.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<ID3D11InfoQueue> 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.");
@@ -180,7 +180,7 @@ bool DXContext::CreateDevice(u32 adapter_index, bool enable_debug_layer)
if (enable_debug_layer)
{
ComPtr<ID3D12InfoQueue> 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);

0 comments on commit 799c524

Please sign in to comment.
You can’t perform that action at this time.