From a78dc3b4442a887762df2da7a75d605fb75dd423 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 16 Sep 2018 19:11:15 +0200 Subject: [PATCH] [dxvk] Do not store a strong reference from adapter to instance The instance stores an array of adapters now. Fixes crash when using the device filter, and fixes the instance not getting destroyed. --- src/dxvk/dxvk_adapter.cpp | 2 +- src/dxvk/dxvk_adapter.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dxvk/dxvk_adapter.cpp b/src/dxvk/dxvk_adapter.cpp index 596170488..59c6eeb7f 100644 --- a/src/dxvk/dxvk_adapter.cpp +++ b/src/dxvk/dxvk_adapter.cpp @@ -8,7 +8,7 @@ namespace dxvk { DxvkAdapter::DxvkAdapter( - const Rc& instance, + DxvkInstance* instance, VkPhysicalDevice handle) : m_instance (instance), m_vki (instance->vki()), diff --git a/src/dxvk/dxvk_adapter.h b/src/dxvk/dxvk_adapter.h index 5d504101f..571da2744 100644 --- a/src/dxvk/dxvk_adapter.h +++ b/src/dxvk/dxvk_adapter.h @@ -32,7 +32,7 @@ namespace dxvk { public: DxvkAdapter( - const Rc& instance, + DxvkInstance* instance, VkPhysicalDevice handle); ~DxvkAdapter(); @@ -180,7 +180,7 @@ namespace dxvk { private: - Rc m_instance; + DxvkInstance* m_instance; Rc m_vki; VkPhysicalDevice m_handle;