From 50b0f360f475367ad0f3ac34142d9ac07d347240 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 15 Jan 2006 00:59:32 +0000 Subject: [PATCH] CreateGraphicsWindow is done by ConfigureGraphicsWindow --- stepmania/src/RageDisplay_D3D.cpp | 5 +---- stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index 0269fb6eec..d0028f4e3c 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -499,10 +499,7 @@ CString RageDisplay_D3D::TryVideoMode( const VideoModeParams &_p, bool &bNewDevi if( FindBackBufferType( p.windowed, p.bpp ) == D3DFMT_UNKNOWN ) // no possible back buffer formats return ssprintf( "FindBackBufferType(%i,%i) failed", p.windowed, p.bpp ); // failed to set mode -#if !defined(XBOX) - if( GraphicsWindow::GetHwnd() == NULL ) - GraphicsWindow::CreateGraphicsWindow( p ); -#else +#if defined(XBOX) p.windowed = false; #endif diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp index 0d11ade9ac..4ab1a43acc 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Win32.cpp @@ -119,7 +119,6 @@ CString LowLevelWindow_Win32::TryVideoMode( const VideoModeParams &p, bool &bNew /* No. Always create and show the window before changing the video mode. * Otherwise, some other window may have focus, and changing the video mode will * cause that window to be resized. */ - GraphicsWindow::CreateGraphicsWindow( p ); GraphicsWindow::ConfigureGraphicsWindow( p ); } else { /* We already have a window. Assume that it's pixel format has already been @@ -176,13 +175,14 @@ CString LowLevelWindow_Win32::TryVideoMode( const VideoModeParams &p, bool &bNew g_HGLRC = NULL; } - GraphicsWindow::CreateGraphicsWindow( p ); // DestroyGraphicsWindowAndOpenGLContext(); // GraphicsWindow::CreateGraphicsWindow( p ); bNewDeviceOut = true; } - GraphicsWindow::ConfigureGraphicsWindow( p ); + /* If we deleted the OpenGL context above, also recreate the window. Otherwise, just + * reconfigure it. */ + GraphicsWindow::ConfigureGraphicsWindow( p, bNewDeviceOut ); GraphicsWindow::SetVideoModeParams( p );