rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-12 13:08:50 +01:00
Code Issues Projects Releases Wiki Activity

[dxgi,d3d9] Use global singleton for DXVK instances

Browse Source 
No reason to have multiple of these around, and instance creation
is fairly expensive.
This commit is contained in:
Philip Rebohle 2023-01-23 17:17:56 +01:00
parent d4143429c4
commit 61d72eebc1
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/d3d9/d3d9_interface.cpp
View File

@ -4,12 +4,16 @@
#include "d3d9_caps.h" #include "d3d9_caps.h"
#include "d3d9_device.h" #include "d3d9_device.h"
#include "../util/util_singleton.h"
#include <algorithm> #include <algorithm>
namespace dxvk { namespace dxvk {
Singleton<DxvkInstance> g_dxvkInstance;
D3D9InterfaceEx::D3D9InterfaceEx(bool bExtended) D3D9InterfaceEx::D3D9InterfaceEx(bool bExtended)
: m_instance ( new DxvkInstance() ) : m_instance ( g_dxvkInstance.acquire() )
, m_extended ( bExtended ) , m_extended ( bExtended )
, m_d3d9Options ( nullptr, m_instance->config() ) , m_d3d9Options ( nullptr, m_instance->config() )
, m_d3d9Interop ( this ) { , m_d3d9Interop ( this ) {
@ -64,6 +68,11 @@ namespace dxvk {
} }
D3D9InterfaceEx::~D3D9InterfaceEx() {
g_dxvkInstance.release();
}
HRESULT STDMETHODCALLTYPE D3D9InterfaceEx::QueryInterface(REFIID riid, void** ppvObject) { HRESULT STDMETHODCALLTYPE D3D9InterfaceEx::QueryInterface(REFIID riid, void** ppvObject) {
if (ppvObject == nullptr) if (ppvObject == nullptr)
return E_POINTER; return E_POINTER;

2
src/d3d9/d3d9_interface.h
View File

@ -20,6 +20,8 @@ namespace dxvk {
D3D9InterfaceEx(bool bExtended); D3D9InterfaceEx(bool bExtended);
~D3D9InterfaceEx();
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject); HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
HRESULT STDMETHODCALLTYPE RegisterSoftwareDevice(void* pInitializeFunction); HRESULT STDMETHODCALLTYPE RegisterSoftwareDevice(void* pInitializeFunction);

8
src/dxgi/dxgi_factory.cpp
View File

@ -3,8 +3,12 @@
#include "dxgi_swapchain.h" #include "dxgi_swapchain.h"
#include "dxgi_swapchain_dispatcher.h" #include "dxgi_swapchain_dispatcher.h"
#include "../util/util_singleton.h"
namespace dxvk { namespace dxvk {
Singleton<DxvkInstance> g_dxvkInstance;
DxgiVkFactory::DxgiVkFactory(DxgiFactory* pFactory) DxgiVkFactory::DxgiVkFactory(DxgiFactory* pFactory)
: m_factory(pFactory) { : m_factory(pFactory) {
@ -44,7 +48,7 @@ namespace dxvk {
DxgiFactory::DxgiFactory(UINT Flags) DxgiFactory::DxgiFactory(UINT Flags)
: m_instance (new DxvkInstance()), : m_instance (g_dxvkInstance.acquire()),
m_interop (this), m_interop (this),
m_options (m_instance->config()), m_options (m_instance->config()),
m_monitorInfo (this, m_options), m_monitorInfo (this, m_options),
@ -55,7 +59,7 @@ namespace dxvk {
DxgiFactory::~DxgiFactory() { DxgiFactory::~DxgiFactory() {
g_dxvkInstance.release();
} }