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

[dxgi] Do not interact with other DXGI objects during swapchain destruction

Browse Source 
This trips up Stalker Anomaly for some reason, but initializing an output
is not meaningful anyway in this situation since we either know the output
in question already, or we don't and it cannot be in a non-default state.

Closes #3531.
This commit is contained in:
Philip Rebohle 2023-06-24 12:35:31 +02:00
parent 3b3ebc9350
commit a7278cdab1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dxgi/dxgi_swapchain.cpp
View File

@ -838,7 +838,7 @@ namespace dxvk {
HRESULT hr = m_monitorInfo->AcquireMonitorData(hMonitor, ppData); HRESULT hr = m_monitorInfo->AcquireMonitorData(hMonitor, ppData);
if (FAILED(hr)) { if (FAILED(hr) && HasLiveReferences()) {
// We may need to initialize a DXGI output to populate monitor data. // We may need to initialize a DXGI output to populate monitor data.
// If acquiring monitor data has failed previously, do not try again. // If acquiring monitor data has failed previously, do not try again.
if (hMonitor == m_monitor && !m_monitorHasOutput) if (hMonitor == m_monitor && !m_monitorHasOutput)

8
src/util/com/com_object.h
View File

@ -68,10 +68,14 @@ namespace dxvk {
} }
} }
ULONG GetPrivateRefCount() { ULONG GetPrivateRefCount() const {
return m_refPrivate.load(); return m_refPrivate.load();
} }
bool HasLiveReferences() const {
return bool(m_refCount.load() | m_refPrivate.load());
}
protected: protected:
std::atomic<uint32_t> m_refCount = { 0ul }; std::atomic<uint32_t> m_refCount = { 0ul };