Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

D3D: Fix Dolphin immediately exiting exclusive fullscreen. #1894

Merged
merged 4 commits into from Jan 19, 2015

Conversation

CrossVR
Copy link
Contributor

@CrossVR CrossVR commented Jan 16, 2015

This PR fixes an issue reported on the forums.

I also added an OSD message to make it clear to the user when exactly exclusive mode is enabled.

@CrossVR
Copy link
Contributor Author

CrossVR commented Jan 17, 2015

@degasus Please review.

@CrossVR CrossVR force-pushed the exclusive-fix branch 2 times, most recently from b57631f to 87360be Compare January 17, 2015 13:54
@CrossVR CrossVR force-pushed the exclusive-fix branch 3 times, most recently from 4006847 to c6cd04a Compare January 19, 2015 20:52
@@ -885,26 +885,21 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
{
if (fullscreen && !exclusive_mode)
{
g_Config.bExclusiveMode = false;

if (g_Config.bExclusiveMode)

This comment was marked as off-topic.

This comment was marked as off-topic.

Allows the UI to easily check the current exclusive mode state.
This simplifies a few checks and prevents the user from ever getting stuck in fullscreen.
// Some backends don't support exclusive fullscreen, so we
// can't tell exactly when exclusive mode is activated.
if (!g_Config.backend_info.bSupportsExclusiveFullscreen)
OSD::AddMessage("Enabled exclusive fullscreen.");

This comment was marked as off-topic.

This comment was marked as off-topic.

@degasus
Copy link
Member

degasus commented Jan 19, 2015

Isn't it a bit noisy to generate an OSD for every fullscreen enabling/disabling?

@dolphin-emu-bot
Copy link
Contributor

FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:

  • ea-vp6 on ogl-lin-nv: diff
  • ed-lighting on ogl-lin-nv: diff
  • fortune-street on ogl-lin-nv: diff
  • fortune-street-white-box on ogl-lin-nv: diff
  • mario-sluggers-bar on ogl-lin-nv: diff
  • mario-tennis-menu on ogl-lin-nv: diff
  • megaman-heat on ogl-lin-nv: diff
  • monkeyball-fuse on ogl-lin-nv: diff
  • mtennis-zfreeze on ogl-lin-nv: diff
  • smg2-fog on ogl-lin-nv: diff
  • smg-marioeyes on ogl-lin-nv: diff
  • soa-black on ogl-lin-nv: diff
  • ssbm-pointsize on ogl-lin-nv: diff
  • tsp3-pinkgrass on ogl-lin-nv: diff
  • ztp-grass on ogl-lin-nv: diff
  • zww-water on ogl-lin-nv: diff

automated-fifoci-reporter

@CrossVR
Copy link
Contributor Author

CrossVR commented Jan 19, 2015

@degasus It is noisy, that's why I was reluctant to add such messages. But there are no clear signs to the user exactly when exclusive mode is enabled. The only real clues are only detectable when you have two monitors.

I could also just not tell them, which is what I actually prefer anyway. The only situations when exclusive mode is not enabled is when you have borderless fullscreen or Render-to-Main enabled or you are alt-tabbing out of fullscreen.

degasus added a commit that referenced this pull request Jan 19, 2015
D3D: Fix Dolphin immediately exiting exclusive fullscreen.
@degasus degasus merged commit 0d0f7ec into dolphin-emu:master Jan 19, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants