From 277829d842ae4aca234de95fb295ed9da043a9fa Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 4 Mar 2017 16:39:50 +1000 Subject: VideoCommon: Eliminate static state in Renderer --- Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/FramebufferManager.cpp') diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 20e90d20f7..46554bdfaf 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -100,8 +100,8 @@ D3DTexture2D*& FramebufferManager::GetResolvedEFBDepthTexture() FramebufferManager::FramebufferManager() { - m_target_width = Renderer::GetTargetWidth(); - m_target_height = Renderer::GetTargetHeight(); + m_target_width = g_renderer->GetTargetWidth(); + m_target_height = g_renderer->GetTargetHeight(); if (m_target_height < 1) { m_target_height = 1; @@ -318,8 +318,8 @@ void XFBSource::CopyEFB(float Gamma) D3D::SetPointCopySampler(); D3D::drawShadedTexQuad( - FramebufferManager::GetEFBColorTexture()->GetSRV(), &rect, Renderer::GetTargetWidth(), - Renderer::GetTargetHeight(), PixelShaderCache::GetColorCopyProgram(true), + FramebufferManager::GetEFBColorTexture()->GetSRV(), &rect, g_renderer->GetTargetWidth(), + g_renderer->GetTargetHeight(), PixelShaderCache::GetColorCopyProgram(true), VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout(), GeometryShaderCache::GetCopyGeometryShader(), Gamma); -- cgit v1.2.3 From 238a70b0060c1d45b12d4702bb41725e9ebb5fa6 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 4 Mar 2017 16:40:08 +1000 Subject: VideoCommon: Move some common initialization logic to RenderBase --- Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/FramebufferManager.cpp') diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 46554bdfaf..b2eb16f345 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -98,18 +98,10 @@ D3DTexture2D*& FramebufferManager::GetResolvedEFBDepthTexture() } } -FramebufferManager::FramebufferManager() +FramebufferManager::FramebufferManager(int target_width, int target_height) { - m_target_width = g_renderer->GetTargetWidth(); - m_target_height = g_renderer->GetTargetHeight(); - if (m_target_height < 1) - { - m_target_height = 1; - } - if (m_target_width < 1) - { - m_target_width = 1; - } + m_target_width = static_cast(std::max(target_width, 1)); + m_target_height = static_cast(std::max(target_height, 1)); DXGI_SAMPLE_DESC sample_desc; sample_desc.Count = g_ActiveConfig.iMultisamples; sample_desc.Quality = 0; -- cgit v1.2.3