NUKE the remains of MST_FLARE

This feature was mostly removed by aa41485, this just removes some of its remnants.

Author: VReaperV

src.cmake

@@ -91,7 +91,6 @@ set(RENDERERLIST
     ${ENGINE_DIR}/renderer/tr_cmds.cpp
     ${ENGINE_DIR}/renderer/tr_curve.cpp
     ${ENGINE_DIR}/renderer/tr_fbo.cpp
-    ${ENGINE_DIR}/renderer/tr_flares.cpp
     ${ENGINE_DIR}/renderer/tr_font.cpp
     ${ENGINE_DIR}/renderer/GeometryCache.cpp
     ${ENGINE_DIR}/renderer/GeometryCache.h

src/engine/renderer/tr_bsp.cpp

@@ -1474,43 +1474,6 @@ static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, bspSurface_t *surf,
 	FinishGenericSurface( ds, ( srfGeneric_t * ) cv, cv->verts[ 0 ].xyz );
 }
 
-/*
-===============
-ParseFlare
-===============
-*/
-static void ParseFlare( dsurface_t *ds, bspSurface_t *surf )
-{
-	srfFlare_t *flare;
-	int        i;
-
-	// set lightmap
-	surf->lightmapNum = -1;
-
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
-
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum );
-
-	if ( r_singleShader->integer && !surf->shader->isSky )
-	{
-		surf->shader = tr.defaultShader;
-	}
-
-	flare = (srfFlare_t*) ri.Hunk_Alloc( sizeof( *flare ), ha_pref::h_low );
-	flare->surfaceType = surfaceType_t::SF_FLARE;
-
-	surf->data = ( surfaceType_t * ) flare;
-
-	for ( i = 0; i < 3; i++ )
-	{
-		flare->origin[ i ] = LittleFloat( ds->lightmapOrigin[ i ] );
-		flare->color[ i ] = LittleFloat( ds->lightmapVecs[ 0 ][ i ] );
-		flare->normal[ i ] = LittleFloat( ds->lightmapVecs[ 2 ][ i ] );
-	}
-}
-
 /*
 =================
 R_MergedWidthPoints
@@ -3475,12 +3438,16 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump )
 				break;
 
 			case mapSurfaceType_t::MST_FLARE:
-				ParseFlare( in, out );
+				Log::Warn( "Surface type not supported: MST_FLARE; firstIndex: %i, numIndexes: %i, shaderNum: %i",
+					in->firstIndex, in->numIndexes, in->shaderNum );
 				numFlares++;
 				break;
 
 			case mapSurfaceType_t::MST_FOLIAGE:
 				// Tr3B: TODO ParseFoliage
+				Log::Warn( "Surface type not supported: MST_FOLIAGE, parsing as MST_TRIANGLE_SOUP instead;"
+					" firstIndex: %i, numIndexes: %i, shaderNum: %i",
+					in->firstIndex, in->numIndexes, in->shaderNum );
 				ParseTriSurf( in, dv, out, indexes );
 				numFoliages++;
 				break;
@@ -3490,7 +3457,7 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump )
 		}
 	}
 
-	Log::Debug("...loaded %d faces, %i meshes, %i trisurfs, %i flares %i foliages", numFaces, numMeshes, numTriSurfs,
+	Log::Debug( "...loaded %d faces, %i meshes, %i trisurfs, %i flares (skipped) %i foliages", numFaces, numMeshes, numTriSurfs,
 	           numFlares, numFoliages );
 
 	if ( r_stitchCurves->integer )

src/engine/renderer/tr_cmds.cpp

@@ -94,11 +94,6 @@ void R_PerformanceCounters()
 	{
 		Log::Notice("fog srf:%i batches:%i", backEnd.pc.c_fogSurfaces, backEnd.pc.c_fogBatches );
 	}
-	else if ( r_speeds->integer == Util::ordinal(renderSpeeds_t::RSPEEDS_FLARES ))
-	{
-		Log::Notice("flare adds:%i tests:%i renders:%i",
-		           backEnd.pc.c_flareAdds, backEnd.pc.c_flareTests, backEnd.pc.c_flareRenders );
-	}
 	else if ( r_speeds->integer == Util::ordinal(renderSpeeds_t::RSPEEDS_SHADING_TIMES ))
 	{
 		Log::Notice("forward shading times: ambient:%i lighting:%i", backEnd.pc.c_forwardAmbientTime,

src/engine/renderer/tr_flares.cpp

@@ -329,7 +329,6 @@ enum class shaderProfilerRenderSubGroupsMode {
 	  RSPEEDS_LIGHTS,
 	  RSPEEDS_SHADOWCUBE_CULLING,
 	  RSPEEDS_FOG,
-	  RSPEEDS_FLARES,
 	  RSPEEDS_SHADING_TIMES,
 	  RSPEEDS_CHC,
 	  RSPEEDS_NEAR_FAR,
@@ -1592,7 +1591,6 @@ enum class shaderProfilerRenderSubGroupsMode {
 	  SF_MD5,
 	  SF_IQM,
 
-	  SF_FLARE,
 	  SF_ENTITY, // beams, rails, lightning, etc that can be determined by entity
 
 	  SF_VBO_MESH,
@@ -1746,14 +1744,6 @@ enum class shaderProfilerRenderSubGroupsMode {
 		polyVert_t    *verts;
 	};
 
-	struct srfFlare_t
-	{
-		surfaceType_t surfaceType;
-		vec3_t        origin;
-		vec3_t        normal;
-		vec3_t        color;
-	};
-
 	struct srfVert_t
 	{
 		vec3_t xyz;
@@ -2475,10 +2465,6 @@ enum class shaderProfilerRenderSubGroupsMode {
 		int   c_fogSurfaces;
 		int   c_fogBatches;
 
-		int   c_flareAdds;
-		int   c_flareTests;
-		int   c_flareRenders;
-
 		int   c_forwardAmbientTime;
 		int   c_forwardLightingTime;
 
@@ -3600,18 +3586,6 @@ inline bool checkGLErrors()
 	/*
 	============================================================
 
-	FLARES, tr_flares.c
-
-	============================================================
-	*/
-
-	void R_ClearFlares();
-
-	void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal );
-
-	/*
-	============================================================
-
 	LIGHTS, tr_light.c
 
 	============================================================

src/engine/renderer/tr_local.h

@@ -273,8 +273,6 @@ bool RE_BeginRegistration( glconfig_t *glconfigOut, glconfig2_t *glconfig2Out )
 		tr.visClusters[i] = -1;
 	}
 
-	R_ClearFlares();
-
 	RE_ClearScene();
 
 	// HACK: give world entity white color for "colored" shader keyword