gl_shader: do not build the lightMapping permutation with deluxe grid but not light grid

Author: illwieckz

src/engine/renderer/gl_shader.cpp

@@ -874,15 +874,23 @@ int GLShaderManager::GetDeformShaderIndex( deformStage_t *deforms, int numDeform
 
 static bool IsUnusedPermutation( const char *compileMacros )
 {
+	bool hasGridLighting = false;
+	bool hasGridDeluxeMapping = false;
+
 	const char* token;
 	while ( *( token = COM_ParseExt2( &compileMacros, false ) ) )
 	{
-		if ( strcmp( token, "USE_DELUXE_MAPPING" ) == 0 )
+		if ( strcmp( token, "USE_GRID_LIGHTING" ) == 0 )
+		{
+			hasGridLighting = true;
+		}
+		else if ( strcmp( token, "USE_DELUXE_MAPPING" ) == 0 )
 		{
 			if ( !glConfig.deluxeMapping ) return true;
 		}
 		else if ( strcmp( token, "USE_GRID_DELUXE_MAPPING" ) == 0 )
 		{
+			hasGridDeluxeMapping = true;
 			if ( !glConfig.deluxeMapping ) return true;
 		}
 		else if ( strcmp( token, "USE_PHYSICAL_MAPPING" ) == 0 )
@@ -906,6 +914,11 @@ static bool IsUnusedPermutation( const char *compileMacros )
 		}
 	}
 
+	if ( !hasGridLighting && hasGridDeluxeMapping )
+	{
+		return true;
+	}
+
 	return false;
 }