NUKE srfSurfaceFace_t

It is now the same as `srfGeneric_t`, so just use that instead.

Author: VReaperV

src/engine/renderer/tr_bsp.cpp

@@ -2605,7 +2605,7 @@ static void R_CreateWorldVBO()
 		if ( *surface->data == surfaceType_t::SF_FACE || *surface->data == surfaceType_t::SF_GRID
 			|| *surface->data == surfaceType_t::SF_TRIANGLES )
 		{
-			srfSurfaceFace_t* srf = ( srfSurfaceFace_t * ) surface->data;
+			srfGeneric_t* srf = ( srfGeneric_t* ) surface->data;
 
 			numVerts += srf->numVerts;
 			numTriangles += srf->numTriangles;

src/engine/renderer/tr_local.h

@@ -1773,9 +1773,6 @@ enum class ssaoMode {
 		float* heightLodError;
 	};
 
-	struct srfSurfaceFace_t : srfGeneric_t {
-	};
-
 	struct srfVBOMesh_t : srfGeneric_t {
 		struct shader_t *shader; // FIXME move this to somewhere else
 

src/engine/renderer/tr_main.cpp

@@ -1219,7 +1219,7 @@ void R_PlaneForSurface( surfaceType_t *surfType, cplane_t *plane ) {
 		case surfaceType_t::SF_FACE:
 		case surfaceType_t::SF_TRIANGLES:
 		{
-			*plane = ( ( srfSurfaceFace_t* ) surfType )->plane;
+			*plane = ( ( srfGeneric_t* ) surfType )->plane;
 			return;
 		}
 		case surfaceType_t::SF_POLY:

src/engine/renderer/tr_marks.cpp

@@ -199,13 +199,13 @@ void R_BoxSurfaces_r( bspNode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t *
 		else if ( * ( surf->data ) == surfaceType_t::SF_FACE )
 		{
 			// the face plane should go through the box
-			s = BoxOnPlaneSide( mins, maxs, & ( ( srfSurfaceFace_t * ) surf->data )->plane );
+			s = BoxOnPlaneSide( mins, maxs, & ( ( srfGeneric_t* ) surf->data )->plane );
 
 			if ( s == 1 || s == 2 )
 			{
 				surf->viewCount = tr.viewCountNoReset;
 			}
-			else if ( DotProduct( ( ( srfSurfaceFace_t * ) surf->data )->plane.normal, dir ) > -0.5 )
+			else if ( DotProduct( ( ( srfGeneric_t* ) surf->data )->plane.normal, dir ) > -0.5 )
 			{
 				// don't add faces that make sharp angles with the projection direction
 				surf->viewCount = tr.viewCountNoReset;
@@ -301,7 +301,6 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 	vec3_t           clipPoints[ 2 ][ MAX_VERTS_ON_POLY ];
 	int              numClipPoints;
 	float            *v;
-	srfSurfaceFace_t *face;
 	srfGridMesh_t    *cv;
 	srfVert_t        *dv;
 	srfTriangle_t    *tri;
@@ -450,7 +449,7 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 		}
 		else if ( *surfaces[ i ] == surfaceType_t::SF_FACE )
 		{
-			face = ( srfSurfaceFace_t * ) surfaces[ i ];
+			srfGeneric_t* face = ( srfGeneric_t* ) surfaces[i];
 
 			// check the normal of this face
 			if ( DotProduct( face->plane.normal, projectionDir ) > -0.5 )

src/engine/renderer/tr_surface.cpp

@@ -748,7 +748,7 @@ static void Tess_SurfacePolychain( srfPoly_t *p )
 Tess_SurfaceFace
 ==============
 */
-static void Tess_SurfaceFace( srfSurfaceFace_t *srf )
+static void Tess_SurfaceFace( srfGeneric_t* srf )
 {
 	GLIMP_LOGCOMMENT( "--- Tess_SurfaceFace ---" );
 

src/engine/renderer/tr_world.cpp

@@ -62,12 +62,12 @@ static bool R_CullSurface( surfaceType_t *surface, shader_t *shader, int planeBi
 	}
 
 	// get generic surface
-	gen = ( srfGeneric_t * ) surface;
+	gen = ( srfGeneric_t* ) surface;
 
 	// plane cull
 	if ( *surface == surfaceType_t::SF_FACE && r_facePlaneCull->integer )
 	{
-		srfSurfaceFace_t *srf = ( srfSurfaceFace_t * )gen;
+		srfGeneric_t* srf = ( srfGeneric_t* ) gen;
 		d = DotProduct( tr.orientation.viewOrigin, srf->plane.normal ) - srf->plane.dist;
 
 		// don't cull exactly on the plane, because there are levels of rounding
@@ -167,7 +167,7 @@ static bool R_CullLightSurface( surfaceType_t *surface, shader_t *shader, trRefL
 	// plane cull
 	if ( *surface == surfaceType_t::SF_FACE && r_facePlaneCull->integer )
 	{
-		srfSurfaceFace_t *srf = ( srfSurfaceFace_t * )gen;
+		srfGeneric_t* srf = ( srfGeneric_t* ) gen;
 		if ( light->l.rlType == refLightType_t::RL_DIRECTIONAL )
 		{
 			d = DotProduct( tr.sunDirection, srf->plane.normal );