vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: client: ensure requested (but failed) renderer won't be loaded twice

Browse source
This commit is contained in:
Alibek Omarov 2024-08-21 12:09:46 +03:00
parent 9dd7f37d42
commit 6b0f378c5b
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
engine/client/ref_common.c
View file

@ -678,7 +678,8 @@ static void R_CollectRendererNames( void )
qboolean R_Init( void ) qboolean R_Init( void )
{ {
qboolean success = false; qboolean success = false;
string requested; string requested_cmdline;
string requested_cvar;
Cvar_RegisterVariable( &gl_vsync ); Cvar_RegisterVariable( &gl_vsync );
Cvar_RegisterVariable( &r_showtextures ); Cvar_RegisterVariable( &r_showtextures );
@ -728,15 +729,16 @@ qboolean R_Init( void )
// 1. Command line `-ref` argument. // 1. Command line `-ref` argument.
// 2. `ref_dll` cvar. // 2. `ref_dll` cvar.
// 3. Detected renderers in `DEFAULT_RENDERERS` order. // 3. Detected renderers in `DEFAULT_RENDERERS` order.
requested[0] = 0; requested_cmdline[0] = 0;
requested_cvar[0] = 0;
if( !success && Sys_GetParmFromCmdLine( "-ref", requested )) if( Sys_GetParmFromCmdLine( "-ref", requested_cmdline ))
success = R_LoadRenderer( requested ); success = R_LoadRenderer( requested_cmdline );
if( !success && COM_CheckString( r_refdll.string )) if( !success && COM_CheckString( r_refdll.string ) && Q_stricmp( requested_cmdline, r_refdll.string ))
{ {
Q_strncpy( requested, r_refdll.string, sizeof( requested )); Q_strncpy( requested_cvar, r_refdll.string, sizeof( requested_cvar ));
success = R_LoadRenderer( requested ); success = R_LoadRenderer( requested_cvar );
} }
if( !success ) if( !success )
@ -746,7 +748,10 @@ qboolean R_Init( void )
for( i = 0; i < ref.numRenderers && !success; i++ ) for( i = 0; i < ref.numRenderers && !success; i++ )
{ {
// skip renderer that was requested but failed to load // skip renderer that was requested but failed to load
if( !Q_strcmp( requested, ref.shortNames[i] )) if( !Q_strcmp( requested_cmdline, ref.shortNames[i] ))
continue;
if( !Q_strcmp( requested_cvar, ref.shortNames[i] ))
continue; continue;
success = R_LoadRenderer( ref.shortNames[i] ); success = R_LoadRenderer( ref.shortNames[i] );