From 1db3c6d883cebc8b0c7347cf994edce7594b9cca Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Tue, 11 Dec 2018 15:33:54 +0100 Subject: [PATCH] [dxgi] Remove SetOutputData and GetOutputData methods --- src/dxgi/dxgi_adapter.cpp | 27 --------------------------- src/dxgi/dxgi_adapter.h | 11 ----------- 2 files changed, 38 deletions(-) diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp index 5e731e793..6bbdd3e59 100644 --- a/src/dxgi/dxgi_adapter.cpp +++ b/src/dxgi/dxgi_adapter.cpp @@ -320,31 +320,4 @@ namespace dxvk { return m_formats.GetFormatInfo(Format, Mode); } - - HRESULT DxgiAdapter::GetOutputData( - HMONITOR Monitor, - DXGI_VK_OUTPUT_DATA* pOutputData) { - std::lock_guard lock(m_outputMutex); - - auto entry = m_outputData.find(Monitor); - if (entry == m_outputData.end()) - return DXGI_ERROR_NOT_FOUND; - - if (pOutputData == nullptr) - return S_FALSE; - - *pOutputData = entry->second; - return S_OK; - } - - - HRESULT DxgiAdapter::SetOutputData( - HMONITOR Monitor, - const DXGI_VK_OUTPUT_DATA* pOutputData) { - std::lock_guard lock(m_outputMutex); - - m_outputData.insert_or_assign(Monitor, *pOutputData); - return S_OK; - } - } diff --git a/src/dxgi/dxgi_adapter.h b/src/dxgi/dxgi_adapter.h index 38c6dcde4..58555fb99 100644 --- a/src/dxgi/dxgi_adapter.h +++ b/src/dxgi/dxgi_adapter.h @@ -76,14 +76,6 @@ namespace dxvk { DXGI_FORMAT Format, DXGI_VK_FORMAT_MODE Mode); - HRESULT GetOutputData( - HMONITOR Monitor, - DXGI_VK_OUTPUT_DATA* pOutputData); - - HRESULT SetOutputData( - HMONITOR Monitor, - const DXGI_VK_OUTPUT_DATA* pOutputData); - private: using OutputMap = std::unordered_map; @@ -94,9 +86,6 @@ namespace dxvk { DXGIVkFormatTable m_formats; UINT64 m_memReservation[2] = { 0, 0 }; - std::mutex m_outputMutex; - OutputMap m_outputData; - }; }