1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-07 16:54:14 +01:00

[dxgi] DxgiSwapchain: Remove SetGammaControl methods

These were only used internally to forward stuff to the presenter
anyway, so we might as well call that method directly.
This commit is contained in:
Philip Rebohle 2018-12-10 12:34:57 +01:00
parent 7eb60daf63
commit 9e9e17348f
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 2 additions and 17 deletions

View File

@ -268,7 +268,7 @@ namespace dxvk {
DXGI_VK_OUTPUT_DATA outputData; DXGI_VK_OUTPUT_DATA outputData;
if (SUCCEEDED(m_adapter->GetOutputData(m_monitor, &outputData)) && outputData.GammaDirty) { if (SUCCEEDED(m_adapter->GetOutputData(m_monitor, &outputData)) && outputData.GammaDirty) {
SetGammaControl(&outputData.GammaCurve); m_presenter->SetGammaControl(DXGI_VK_GAMMA_CP_COUNT, outputData.GammaCurve.GammaCurve);
outputData.GammaDirty = FALSE; outputData.GammaDirty = FALSE;
m_adapter->SetOutputData(m_monitor, &outputData); m_adapter->SetOutputData(m_monitor, &outputData);
@ -487,16 +487,6 @@ namespace dxvk {
} }
HRESULT DxgiSwapChain::SetGammaControl(const DXGI_GAMMA_CONTROL* pGammaControl) {
return m_presenter->SetGammaControl(DXGI_VK_GAMMA_CP_COUNT, pGammaControl->GammaCurve);
}
HRESULT DxgiSwapChain::SetDefaultGammaControl() {
return m_presenter->SetGammaControl(0, nullptr);
}
VkExtent2D DxgiSwapChain::GetWindowSize() const { VkExtent2D DxgiSwapChain::GetWindowSize() const {
RECT windowRect; RECT windowRect;
@ -606,7 +596,7 @@ namespace dxvk {
rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE); SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE);
return SetDefaultGammaControl(); return m_presenter->SetGammaControl(0, nullptr);
} }

View File

@ -155,11 +155,6 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE SetColorSpace1( HRESULT STDMETHODCALLTYPE SetColorSpace1(
DXGI_COLOR_SPACE_TYPE ColorSpace) final; DXGI_COLOR_SPACE_TYPE ColorSpace) final;
HRESULT SetGammaControl(
const DXGI_GAMMA_CONTROL* pGammaControl);
HRESULT SetDefaultGammaControl();
private: private:
struct WindowState { struct WindowState {