summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/Render.cpp
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-07-26 12:43:49 +0200
committerJules Blok <jules.blok@gmail.com>2014-07-26 13:04:39 +0200
commit6724ce627516b89cc126ee7f4a876fc8472d46ca (patch)
treed1db8a2c346882e5249b1502ec5e3e5194a45d34 /Source/Core/VideoBackends/D3D/Render.cpp
parenteea7086b23f45e4566550e99e3bd1fec7ecd4e2c (diff)
Cosmetic changes based on feedback on PR #506.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/Render.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index 1f883c18fe..551d40b95c 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -938,7 +938,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
SetWindowSize(fbWidth, fbHeight);
const bool windowResized = CheckForResize();
- const bool fullscreen = g_ActiveConfig.bFullscreen && !g_ActiveConfig.bForceBorderlessFullscreen &&
+ const bool fullscreen = g_ActiveConfig.ExclusiveFullscreenEnabled() &&
!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain;
bool fullscreen_changed = s_last_fullscreen_mode != fullscreen;
@@ -948,7 +948,9 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
{
if (!!fullscreen_state != fullscreen && Host_RendererHasFocus())
{
- // We should be in fullscreen, but we're not. Restore it when we regain focus.
+ // The current fullscreen state does not match the configuration,
+ // this may happen when the renderer frame loses focus. When the
+ // render frame is in focus again we can re-apply the configuration.
fullscreen_changed = true;
}
}
@@ -967,7 +969,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
// Flip/present backbuffer to frontbuffer here
D3D::Present();
- // resize the back buffers NOW to avoid flickering
+ // Resize the back buffers NOW to avoid flickering
if (xfbchanged ||
windowResized ||
fullscreen_changed ||
@@ -979,13 +981,13 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
if (windowResized || fullscreen_changed)
{
- // apply fullscreen state
+ // Apply fullscreen state
if (fullscreen_changed)
{
s_last_fullscreen_mode = fullscreen;
D3D::swapchain->SetFullscreenState(fullscreen, nullptr);
- // notify the host that it is safe to exit fullscreen
+ // Notify the host that it is safe to exit fullscreen
if (!fullscreen)
{
Host_RequestFullscreen(false);