actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix spurious ChangeDisplaySettings calls; this fixes extra

Browse Source 
graphics hitches when entering fullscreen.
This commit is contained in:
Glenn Maynard
2005-11-29 00:44:42 +00:00
parent be332f9883
commit e130c39f86
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Win32/GraphicsWindow.cpp
+6 -2
View File
@@ -27,6 +27,7 @@ static bool g_bD3D = false;
/* If we're fullscreen, this is the mode we set. */ /* If we're fullscreen, this is the mode we set. */
static DEVMODE g_FullScreenDevMode; static DEVMODE g_FullScreenDevMode;
static bool g_bRecreatingVideoMode = false;
static CString GetNewWindow() static CString GetNewWindow()
{ {
@@ -69,7 +70,7 @@ LRESULT CALLBACK GraphicsWindow::GraphicsWindow_WndProc( HWND hWnd, UINT msg, WP
LOG->MapLog( "LOST_FOCUS", "Lost focus to: %s", sStr.c_str() ); LOG->MapLog( "LOST_FOCUS", "Lost focus to: %s", sStr.c_str() );
} }
if( !g_bD3D && !g_CurrentParams.windowed ) if( !g_bD3D && !g_CurrentParams.windowed && !g_bRecreatingVideoMode )
{ {
/* In OpenGL (not D3D), it's our job to unset and reset the full-screen video mode /* In OpenGL (not D3D), it's our job to unset and reset the full-screen video mode
* when we focus changes, and to hide and show the window. Hiding is done in WM_KILLFOCUS, * when we focus changes, and to hide and show the window. Hiding is done in WM_KILLFOCUS,
@@ -96,7 +97,7 @@ LRESULT CALLBACK GraphicsWindow::GraphicsWindow_WndProc( HWND hWnd, UINT msg, WP
return 0; return 0;
} }
case WM_KILLFOCUS: case WM_KILLFOCUS:
if( !g_bD3D && !g_CurrentParams.windowed ) if( !g_bD3D && !g_CurrentParams.windowed && !g_bRecreatingVideoMode )
ShowWindow( g_hWndMain, SW_SHOWMINNOACTIVE ); ShowWindow( g_hWndMain, SW_SHOWMINNOACTIVE );
break; break;
@@ -253,7 +254,10 @@ void GraphicsWindow::RecreateGraphicsWindow( const VideoModeParams &p )
if( hWnd == NULL ) if( hWnd == NULL )
RageException::Throw( "%s", werr_ssprintf( GetLastError(), "CreateWindow" ).c_str() ); RageException::Throw( "%s", werr_ssprintf( GetLastError(), "CreateWindow" ).c_str() );
/* While we change to the new window, don't do ChangeDisplaySettings in WM_ACTIVATE. */
g_bRecreatingVideoMode = true;
SetForegroundWindow( hWnd ); SetForegroundWindow( hWnd );
g_bRecreatingVideoMode = false;
DestroyGraphicsWindow(); DestroyGraphicsWindow();