rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-31 14:52:11 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[dxgi] Create persistent DxgiOutput object"

Browse Source 
This reverts commit ad7f0971cf5ba5ed6dc3ace88badc9fcc9ba7504.
Causes crashes in Overwatch due to weird refcount behaviour.
This commit is contained in:
Philip Rebohle 2018-04-12 01:48:57 +02:00
parent 3c6eb91c63
commit c9c3bc12cc
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dxgi/dxgi_adapter.cpp
View File

@ -16,7 +16,6 @@ namespace dxvk {
const Rc<DxvkAdapter>& adapter)
: m_factory (factory),
m_adapter (adapter) {
SetupOutputs();
SetupFormatTable();
}
@ -65,10 +64,14 @@ namespace dxvk {
if (ppOutput == nullptr)
return DXGI_ERROR_INVALID_CALL;
if (Output > 0)
if (Output > 0) {
*ppOutput = nullptr;
return DXGI_ERROR_NOT_FOUND;
}
*ppOutput = m_output.ref();
// TODO support multiple monitors
HMONITOR monitor = ::MonitorFromPoint({ 0, 0 }, MONITOR_DEFAULTTOPRIMARY);
*ppOutput = ref(new DxgiOutput(this, monitor));
return S_OK;
}
@ -274,13 +277,6 @@ namespace dxvk {
}
void DxgiAdapter::SetupOutputs() {
// TODO support multiple monitors
HMONITOR monitor = ::MonitorFromPoint({ 0, 0 }, MONITOR_DEFAULTTOPRIMARY);
m_output = new DxgiOutput(this, monitor);
}
void DxgiAdapter::SetupFormatTable() {
/***********************************************************************************/
/* C O L O R F O R M A T S */

3
src/dxgi/dxgi_adapter.h
View File

@ -66,7 +66,6 @@ namespace dxvk {
using FormatMap = std::unordered_map<DXGI_FORMAT, DxgiFormatInfo>;
Com<DxgiFactory> m_factory;
Com<DxgiOutput> m_output;
Rc<DxvkAdapter> m_adapter;
FormatMap m_colorFormats;
@ -92,8 +91,6 @@ namespace dxvk {
VkFormat dstFormat,
VkImageAspectFlags srvAspect);
void SetupOutputs();
void SetupFormatTable();
};