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

don't throw fatal if CreateDevice or Reset fails so that the resolution fallback logic has a chance

Browse Source
This commit is contained in:
Chris Danford
2003-10-08 07:12:48 +00:00
parent b0e05dfbee
commit e63eb9bdfa
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_D3D.cpp
+4 -8
View File
@@ -508,10 +508,8 @@ CString RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
&g_pd3dDevice ); &g_pd3dDevice );
if( FAILED(hr) ) if( FAILED(hr) )
{ {
#if defined _WINDOWS // Likely D3D_ERR_INVALIDCALL. The driver probably doesn't support this video mode.
SDL_QuitSubSystem(SDL_INIT_VIDEO); // exit out of full screen. The ~RageDisplay will not be called! return ssprintf( "CreateDevice failed: '%s'", GetErrorString(hr).c_str() );
#endif
RageException::Throw( "CreateDevice failed: '%s'", GetErrorString(hr).c_str() );
} }
} }
else else
@@ -520,10 +518,8 @@ CString RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
hr = g_pd3dDevice->Reset( &g_d3dpp ); hr = g_pd3dDevice->Reset( &g_d3dpp );
if( FAILED(hr) ) if( FAILED(hr) )
{ {
#if defined _WINDOWS // Likely D3D_ERR_INVALIDCALL. The driver probably doesn't support this video mode.
SDL_QuitSubSystem(SDL_INIT_VIDEO); // exit out of full screen. The ~RageDisplay will not be called! return ssprintf("g_pd3dDevice->Reset failed: '%s'", GetErrorString(hr).c_str() );
#endif
RageException::Throw( "g_pd3dDevice->Reset failed: '%s'", GetErrorString(hr).c_str() );
} }
} }