summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/Render.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/Render.cpp112
1 files changed, 61 insertions, 51 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index 1e6e7d5290..0e8c822d23 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -53,12 +53,12 @@ typedef struct _Nv_Stereo_Image_Header
#define NVSTEREO_IMAGE_SIGNATURE 0x4433564e
-Renderer::Renderer() : ::Renderer(D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight())
+Renderer::Renderer(int backbuffer_width, int backbuffer_height)
+ : ::Renderer(backbuffer_width, backbuffer_height)
{
m_last_multisamples = g_ActiveConfig.iMultisamples;
m_last_stereo_mode = g_ActiveConfig.stereo_mode != StereoMode::Off;
- m_last_fullscreen_mode = D3D::GetFullscreenState();
-
+ m_last_fullscreen_state = D3D::GetFullscreenState();
g_framebuffer_manager = std::make_unique<FramebufferManager>(m_target_width, m_target_height);
SetupDeviceObjects();
@@ -239,25 +239,6 @@ TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
return result;
}
-// With D3D, we have to resize the backbuffer if the window changed
-// size.
-bool Renderer::CheckForResize()
-{
- RECT rcWindow;
- GetClientRect(D3D::hWnd, &rcWindow);
- int client_width = rcWindow.right - rcWindow.left;
- int client_height = rcWindow.bottom - rcWindow.top;
-
- // Sanity check
- if ((client_width != GetBackbufferWidth() || client_height != GetBackbufferHeight()) &&
- client_width >= 4 && client_height >= 4)
- {
- return true;
- }
-
- return false;
-}
-
void Renderer::SetScissorRect(const MathUtil::Rectangle<int>& rc)
{
const RECT rect = {rc.left, rc.top, rc.right, rc.bottom};
@@ -549,12 +530,13 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
ResetAPIState();
// Prepare to copy the XFBs to our backbuffer
+ CheckForSurfaceChange();
+ CheckForSurfaceResize();
UpdateDrawRectangle();
- TargetRectangle targetRc = GetTargetRectangle();
+ TargetRectangle targetRc = GetTargetRectangle();
+ static constexpr std::array<float, 4> clear_color{{0.f, 0.f, 0.f, 1.f}};
D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr);
-
- constexpr std::array<float, 4> clear_color{{0.f, 0.f, 0.f, 1.f}};
D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), clear_color.data());
// activate linear filtering for the buffer copies
@@ -565,8 +547,8 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
xfb_texture->GetConfig().width, xfb_texture->GetConfig().height, Gamma);
// Reset viewport for drawing text
- D3D11_VIEWPORT vp =
- CD3D11_VIEWPORT(0.0f, 0.0f, (float)GetBackbufferWidth(), (float)GetBackbufferHeight());
+ D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.0f, 0.0f, static_cast<float>(m_backbuffer_width),
+ static_cast<float>(m_backbuffer_height));
D3D::context->RSSetViewports(1, &vp);
Renderer::DrawDebugText();
@@ -580,41 +562,21 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
g_texture_cache->OnConfigChanged(g_ActiveConfig);
VertexShaderCache::RetreiveAsyncShaders();
- const bool window_resized = CheckForResize();
- const bool fullscreen = D3D::GetFullscreenState();
- const bool fs_changed = m_last_fullscreen_mode != fullscreen;
-
// Flip/present backbuffer to frontbuffer here
- D3D::Present();
+ if (D3D::swapchain)
+ D3D::Present();
// Resize the back buffers NOW to avoid flickering
- if (CalculateTargetSize() || window_resized || fs_changed ||
- m_last_multisamples != g_ActiveConfig.iMultisamples ||
+ if (CalculateTargetSize() || m_last_multisamples != g_ActiveConfig.iMultisamples ||
m_last_stereo_mode != (g_ActiveConfig.stereo_mode != StereoMode::Off))
{
m_last_multisamples = g_ActiveConfig.iMultisamples;
- m_last_fullscreen_mode = fullscreen;
+ m_last_stereo_mode = g_ActiveConfig.stereo_mode != StereoMode::Off;
PixelShaderCache::InvalidateMSAAShaders();
-
- if (window_resized || fs_changed)
- {
- // TODO: Aren't we still holding a reference to the back buffer right now?
- D3D::Reset();
- SAFE_RELEASE(m_screenshot_texture);
- SAFE_RELEASE(m_3d_vision_texture);
- m_backbuffer_width = D3D::GetBackBufferWidth();
- m_backbuffer_height = D3D::GetBackBufferHeight();
- }
-
UpdateDrawRectangle();
- m_last_stereo_mode = g_ActiveConfig.stereo_mode != StereoMode::Off;
-
- D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr);
-
g_framebuffer_manager.reset();
g_framebuffer_manager = std::make_unique<FramebufferManager>(m_target_width, m_target_height);
-
D3D::context->ClearRenderTargetView(FramebufferManager::GetEFBColorTexture()->GetRTV(),
clear_color.data());
D3D::context->ClearDepthStencilView(FramebufferManager::GetEFBDepthTexture()->GetDSV(),
@@ -633,6 +595,54 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
FramebufferManager::BindEFBRenderTarget();
}
+void Renderer::CheckForSurfaceChange()
+{
+ if (!m_surface_changed.TestAndClear())
+ return;
+
+ m_surface_handle = m_new_surface_handle;
+ m_new_surface_handle = nullptr;
+
+ SAFE_RELEASE(m_screenshot_texture);
+ SAFE_RELEASE(m_3d_vision_texture);
+ D3D::Reset(reinterpret_cast<HWND>(m_new_surface_handle));
+ UpdateBackbufferSize();
+}
+
+void Renderer::CheckForSurfaceResize()
+{
+ const bool fullscreen_state = D3D::GetFullscreenState();
+ const bool exclusive_fullscreen_changed = fullscreen_state != m_last_fullscreen_state;
+ if (!m_surface_resized.TestAndClear() && !exclusive_fullscreen_changed)
+ return;
+
+ m_backbuffer_width = m_new_backbuffer_width;
+ m_backbuffer_height = m_new_backbuffer_height;
+
+ SAFE_RELEASE(m_screenshot_texture);
+ SAFE_RELEASE(m_3d_vision_texture);
+ m_last_fullscreen_state = fullscreen_state;
+ if (D3D::swapchain)
+ D3D::ResizeSwapChain();
+ UpdateBackbufferSize();
+}
+
+void Renderer::UpdateBackbufferSize()
+{
+ if (D3D::swapchain)
+ {
+ DXGI_SWAP_CHAIN_DESC1 desc = {};
+ D3D::swapchain->GetDesc1(&desc);
+ m_backbuffer_width = std::max(desc.Width, 1u);
+ m_backbuffer_height = std::max(desc.Height, 1u);
+ }
+ else
+ {
+ m_backbuffer_width = 1;
+ m_backbuffer_height = 1;
+ }
+}
+
// ALWAYS call RestoreAPIState for each ResetAPIState call you're doing
void Renderer::ResetAPIState()
{