From 654e9e6fd8ff94ab2c6a4c0cf2f65f3173de7e10 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Thu, 12 Apr 2018 01:51:28 +0200 Subject: [PATCH] [dxgi] Re-enable strong reference to DxgiAdapter in DxgiOutput --- src/dxgi/dxgi_output.cpp | 2 +- src/dxgi/dxgi_output.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dxgi/dxgi_output.cpp b/src/dxgi/dxgi_output.cpp index c2ac16a3..dd4206a5 100644 --- a/src/dxgi/dxgi_output.cpp +++ b/src/dxgi/dxgi_output.cpp @@ -13,7 +13,7 @@ namespace dxvk { DxgiOutput::DxgiOutput( - DxgiAdapter* adapter, + const Com& adapter, HMONITOR monitor) : m_adapter(adapter), m_monitor(monitor) { diff --git a/src/dxgi/dxgi_output.h b/src/dxgi/dxgi_output.h index 77e93c65..3543cae1 100644 --- a/src/dxgi/dxgi_output.h +++ b/src/dxgi/dxgi_output.h @@ -14,8 +14,8 @@ namespace dxvk { public: DxgiOutput( - DxgiAdapter* adapter, - HMONITOR monitor); + const Com& adapter, + HMONITOR monitor); ~DxgiOutput(); @@ -69,7 +69,7 @@ namespace dxvk { private: - DxgiAdapter* m_adapter = nullptr; + Com m_adapter = nullptr; HMONITOR m_monitor = nullptr; uint32_t GetFormatBpp(DXGI_FORMAT Format) const;