Skip idlogo cinematic and tweak renderer lighting

Add logic to skip the idlogo cinematic when com_skipIdLogo is set: introduce CL_CinematicBasename, CL_ShouldSkipIdLogoCinematic and CL_RunCinematicNextmap, use them from CIN_PlayCinematic/CL_PlayCinematic_f and RoQShutdown. Adjust Com_Init to set/queue intro/idlogo handling based on com_skipIdLogo and com_introPlayed.

Renderer: widen legacy dlight conditionals to also cover USE_PMLIGHT for bounds and light culling, remove an unused glxDlightProgramActive flag, and update GLx stream defaults/descriptions to disable r_glxStreamDrawDynamicLights by default and mark it experimental.

Author: themuffinator

code/client/cl_cin.cpp

@@ -93,6 +93,64 @@ extern	int		s_rawend;
 static void RoQ_init( void );
 static void CIN_SetLooping (int handle, qboolean loop);
 
+static const char *CL_CinematicBasename( const char *path )
+{
+	const char *slash;
+	const char *backslash;
+
+	if ( !path ) {
+		return "";
+	}
+
+	slash = strrchr( path, '/' );
+	backslash = strrchr( path, '\\' );
+
+	if ( slash && ( !backslash || slash > backslash ) ) {
+		return slash + 1;
+	}
+	if ( backslash ) {
+		return backslash + 1;
+	}
+
+	return path;
+}
+
+static qboolean CL_ShouldSkipIdLogoCinematic( const char *arg )
+{
+	const char *base;
+	const char *dot;
+	size_t len;
+
+	if ( !Cvar_VariableIntegerValue( "com_skipIdLogo" ) ) {
+		return qfalse;
+	}
+
+	base = CL_CinematicBasename( arg );
+	dot = strrchr( base, '.' );
+	len = dot ? (size_t)( dot - base ) : strlen( base );
+
+	if ( len != 6 || Q_stricmpn( base, "idlogo", 6 ) != 0 ) {
+		return qfalse;
+	}
+
+	if ( dot && Q_stricmp( dot, ".roq" ) != 0 ) {
+		return qfalse;
+	}
+
+	return qtrue;
+}
+
+static void CL_RunCinematicNextmap( void )
+{
+	const char *s;
+
+	s = Cvar_VariableString( "nextmap" );
+	if ( s[0] ) {
+		Cbuf_ExecuteText( EXEC_APPEND, va("%s\n", s) );
+		Cvar_Set( "nextmap", "" );
+	}
+}
+
 /******************************************************************************
 *
 * Class:		trFMV
@@ -1329,8 +1387,6 @@ static void RoQ_init( void )
 ******************************************************************************/
 
 static void RoQShutdown( void ) {
-	const char *s;
-
 	if (!cinTable[currentHandle].buf) {
 		return;
 	}
@@ -1349,11 +1405,7 @@ static void RoQShutdown( void ) {
 		// if we are aborting the intro cinematic with
 		// a devmap command, nextmap would be valid by
 		// the time it was referenced
-		s = Cvar_VariableString( "nextmap" );
-		if ( s[0] ) {
-			Cbuf_ExecuteText( EXEC_APPEND, va("%s\n", s) );
-			Cvar_Set( "nextmap", "" );
-		}
+		CL_RunCinematicNextmap();
 		CL_handle = -1;
 	}
 	cinTable[currentHandle].fileName[0] = '\0';
@@ -1472,6 +1524,14 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi
 	std::array<char, MAX_OSPATH> name;
 	int		i;
 
+	if ( CL_ShouldSkipIdLogoCinematic( arg )
+		&& ( ( systemBits & CIN_system ) != 0 || cls.state < CA_LOADING ) ) {
+		if ( ( systemBits & CIN_system ) != 0 ) {
+			CL_RunCinematicNextmap();
+		}
+		return -1;
+	}
+
 	if (strchr(arg, '/') == nullptr && strchr(arg, '\\') == nullptr) {
 		Com_sprintf( name.data(), static_cast<int>( name.size() ), "video/%s", arg );
 	} else {
@@ -1694,13 +1754,18 @@ void CL_PlayCinematic_f( void ) {
 	int bits = CIN_system;
 
 	Com_DPrintf("CL_PlayCinematic_f\n");
+	arg = Cmd_Argv( 1 );
+	s = Cmd_Argv(2);
+
+	if ( CL_ShouldSkipIdLogoCinematic( arg ) ) {
+		CL_RunCinematicNextmap();
+		return;
+	}
+
 	if (cls.state == CA_CINEMATIC) {
 		SCR_StopCinematic();
 	}
 
-	arg = Cmd_Argv( 1 );
-	s = Cmd_Argv(2);
-
 	if ((s && s[0] == '1') || Q_stricmp(arg,"demoend.roq")==0 || Q_stricmp(arg,"end.roq")==0) {
 		bits |= CIN_hold;
 	}

code/qcommon/common.c

@@ -4008,11 +4008,16 @@ void Com_Init( char *commandLine ) {
 		// if the user didn't give any commands, run default action
 		if ( !com_dedicated->integer ) {
 #ifndef DEDICATED
-			if ( !com_skipIdLogo || !com_skipIdLogo->integer )
-				Cbuf_AddText( "cinematic idlogo.RoQ\n" );
 			if( !com_introPlayed->integer ) {
 				Cvar_Set( com_introPlayed->name, "1" );
-				Cvar_Set( "nextmap", "cinematic intro.RoQ" );
+				if ( com_skipIdLogo && com_skipIdLogo->integer ) {
+					Cbuf_AddText( "cinematic intro.RoQ\n" );
+				} else {
+					Cvar_Set( "nextmap", "cinematic intro.RoQ" );
+				}
+			}
+			if ( !com_skipIdLogo || !com_skipIdLogo->integer ) {
+				Cbuf_AddText( "cinematic idlogo.RoQ\n" );
 			}
 #endif
 		}

code/renderer/tr_arb.c

@@ -777,8 +777,6 @@ void GL_ProgramEnable( void )
 
 #ifdef USE_PMLIGHT
 #ifdef RENDERER_GLX
-static qboolean glxDlightProgramActive = qfalse;
-
 static qboolean GLX_TryStreamDrawPMLightPass( int numIndexes, const glIndex_t *indexes )
 {
 	const shaderCommands_t *input;
@@ -819,7 +817,7 @@ static qboolean GLX_TryStreamDrawPMLightPass( int numIndexes, const glIndex_t *i
 
 	materialFlags = GLX_STAGE_DLIGHT_MAP | GLX_STAGE_ST0;
 	categoryMask = GLX_CompatDynamicCategoryMaskForTess( input, materialFlags );
-	if ( !glxDlightProgramActive && !GLX_CompatStreamDrawAllowsMaterial( materialFlags, 0,
+	if ( !GLX_CompatStreamDrawAllowsMaterial( materialFlags, 0,
 		GLX_MATERIAL_RGBGEN_IDENTITY, GLX_MATERIAL_ALPHAGEN_SKIP,
 		GLX_MATERIAL_TCGEN_TEXTURE, GLX_MATERIAL_TCGEN_BAD,
 		0, 0, 0, 0, 0, 0,
@@ -1222,7 +1220,6 @@ qboolean GLX_LightingSetupProgram( const shaderStage_t *pStage )
 	float radius;
 	float textureScale;
 
-	glxDlightProgramActive = qfalse;
 	tess.dlightUpdateParams = qfalse;
 	tess.cullType = tess.shader->cullType;
 
@@ -1301,13 +1298,11 @@ qboolean GLX_LightingSetupProgram( const shaderStage_t *pStage )
 		return qfalse;
 	}
 
-	glxDlightProgramActive = qtrue;
 	return qtrue;
 }
 
 void GLX_LightingProgramUnbind( void )
 {
-	glxDlightProgramActive = qfalse;
 	GLX_CompatUnbindDlightProgram();
 }
 #endif

code/renderer/tr_bsp.c

@@ -654,7 +654,7 @@ static void ParseFace( const dsurface_t *ds, const drawVert_t *verts, msurface_t
 	cv->numPoints = numPoints;
 	cv->numIndices = numIndexes;
 	cv->ofsIndices = ofsIndexes;
-#ifdef USE_LEGACY_DLIGHTS
+#if defined( USE_LEGACY_DLIGHTS ) || defined( USE_PMLIGHT )
 	ClearBounds( cv->bounds[0], cv->bounds[1] );
 #endif
 
@@ -663,7 +663,7 @@ static void ParseFace( const dsurface_t *ds, const drawVert_t *verts, msurface_t
 		for ( j = 0 ; j < 3 ; j++ ) {
 			cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
 		}
-#ifdef USE_LEGACY_DLIGHTS
+#if defined( USE_LEGACY_DLIGHTS ) || defined( USE_PMLIGHT )
 		AddPointToBounds( cv->points[i], cv->bounds[0], cv->bounds[1] );
 #endif
 		for ( j = 0 ; j < 2 ; j++ ) {

code/renderer/tr_local.h

@@ -859,6 +859,8 @@ typedef struct {
 	// dynamic lighting information
 #ifdef USE_LEGACY_DLIGHTS
 	int			dlightBits;
+#endif
+#if defined( USE_LEGACY_DLIGHTS ) || defined( USE_PMLIGHT )
 	vec3_t		bounds[2];
 #endif
 	int			vboItemIndex;

code/renderer/tr_world.c

@@ -202,7 +202,15 @@ qboolean R_LightCullBounds( const dlight_t* dl, const vec3_t mins, const vec3_t
 
 static qboolean R_LightCullFace( const srfSurfaceFace_t* face, const dlight_t* dl )
 {
-	float d = DotProduct( dl->transformed, face->plane.normal ) - face->plane.dist;
+	float d;
+
+#if defined( USE_LEGACY_DLIGHTS ) || defined( USE_PMLIGHT )
+	if ( R_LightCullBounds( dl, face->bounds[0], face->bounds[1] ) ) {
+		return qtrue;
+	}
+#endif
+
+	d = DotProduct( dl->transformed, face->plane.normal ) - face->plane.dist;
 	if ( dl->linear )
 	{
 		float d2 = DotProduct( dl->transformed2, face->plane.normal ) - face->plane.dist;

code/rendererglx/glx_module.cpp

@@ -123,7 +123,7 @@ static const ProfileCvarSetting GLX_PROFILE_CVARS[] = {
 	{ "r_glxStreamDrawDepthFragment", "0", "1", "1" },
 	{ "r_glxStreamDrawTexMods", "0", "1", "1" },
 	{ "r_glxStreamDrawEnvironment", "0", "1", "1" },
-	{ "r_glxStreamDrawDynamicLights", "0", "1", "1" },
+	{ "r_glxStreamDrawDynamicLights", "0", "0", "0" },
 	{ "r_glxStreamDrawScreenMaps", "0", "0", "0" },
 	{ "r_glxStreamDrawVideoMaps", "0", "0", "0" },
 	{ "r_glxStreamDrawShadows", "0", "1", "1" },

code/rendererglx/glx_stream.cpp

@@ -800,9 +800,9 @@ void GLX_Stream_RegisterCvars( StreamState *state )
 	RI().Cvar_SetDescription( state->r_glxStreamDrawEnvironment,
 		"Allow GLx streamed draws for stages using legacy CPU-computed environment texture coordinates." );
 
-	state->r_glxStreamDrawDynamicLights = RI().Cvar_Get( "r_glxStreamDrawDynamicLights", "1", CVAR_ARCHIVE_ND | CVAR_DEVELOPER );
+	state->r_glxStreamDrawDynamicLights = RI().Cvar_Get( "r_glxStreamDrawDynamicLights", "0", CVAR_ARCHIVE_ND | CVAR_DEVELOPER );
 	RI().Cvar_SetDescription( state->r_glxStreamDrawDynamicLights,
-		"Allow GLx streamed draws for dynamic-light map stages when GLx stream drawing is enabled." );
+		"Allow experimental GLx streamed draws for dynamic-light map stages when GLx stream drawing is enabled." );
 
 	state->r_glxStreamDrawScreenMaps = RI().Cvar_Get( "r_glxStreamDrawScreenMaps", "0", CVAR_ARCHIVE_ND | CVAR_DEVELOPER );
 	RI().Cvar_SetDescription( state->r_glxStreamDrawScreenMaps,