Remove field trRefEntity_t::cull

It was pointless since it was only read immediately after being written.

Author: slipher

src/engine/renderer/tr_animation.cpp

@@ -610,7 +610,7 @@ static ListAnimationsCmd listAnimationsCmdRegistration;
 R_CullMD5
 =============
 */
-static void R_CullMD5( trRefEntity_t *ent )
+static cullResult_t R_CullMD5( trRefEntity_t *ent )
 {
 	int        i;
 
@@ -638,19 +638,16 @@ static void R_CullMD5( trRefEntity_t *ent )
 	{
 		case cullResult_t::CULL_IN:
 			tr.pc.c_box_cull_md5_in++;
-			ent->cull = cullResult_t::CULL_IN;
-			return;
+			return cullResult_t::CULL_IN;
 
 		case cullResult_t::CULL_CLIP:
 			tr.pc.c_box_cull_md5_clip++;
-			ent->cull = cullResult_t::CULL_CLIP;
-			return;
+			return cullResult_t::CULL_CLIP;
 
 		case cullResult_t::CULL_OUT:
 		default:
 			tr.pc.c_box_cull_md5_out++;
-			ent->cull = cullResult_t::CULL_OUT;
-			return;
+			return cullResult_t::CULL_OUT;
 	}
 }
 
@@ -674,9 +671,7 @@ void R_AddMD5Surfaces( trRefEntity_t *ent )
 
 	// cull the entire model if merged bounding box of both frames
 	// is outside the view frustum
-	R_CullMD5( ent );
-
-	if ( ent->cull == cullResult_t::CULL_OUT )
+	if ( R_CullMD5( ent ) == cullResult_t::CULL_OUT )
 	{
 		return;
 	}

src/engine/renderer/tr_local.h

@@ -424,7 +424,6 @@ enum class ssaoMode {
 		// local
 		float        axisLength; // compensate for non-normalized axis
 
-		cullResult_t cull;
 		vec3_t       localBounds[ 2 ];
 		vec3_t       worldBounds[ 2 ];
 	};

src/engine/renderer/tr_mesh.cpp

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 R_CullMDV
 =============
 */
-static void R_CullMDV( mdvModel_t *model, trRefEntity_t *ent )
+static cullResult_t R_CullMDV( mdvModel_t *model, trRefEntity_t *ent )
 {
 	mdvFrame_t *oldFrame, *newFrame;
 	int        i;
@@ -59,13 +59,11 @@ static void R_CullMDV( mdvModel_t *model, trRefEntity_t *ent )
 			{
 				case cullResult_t::CULL_OUT:
 					tr.pc.c_sphere_cull_mdv_out++;
-					ent->cull = cullResult_t::CULL_OUT;
-					return;
+					return cullResult_t::CULL_OUT;
 
 				case cullResult_t::CULL_IN:
 					tr.pc.c_sphere_cull_mdv_in++;
-					ent->cull = cullResult_t::CULL_IN;
-					return;
+					return cullResult_t::CULL_IN;
 
 				case cullResult_t::CULL_CLIP:
 					tr.pc.c_sphere_cull_mdv_clip++;
@@ -91,14 +89,12 @@ static void R_CullMDV( mdvModel_t *model, trRefEntity_t *ent )
 				if ( sphereCull == cullResult_t::CULL_OUT )
 				{
 					tr.pc.c_sphere_cull_mdv_out++;
-					ent->cull = cullResult_t::CULL_OUT;
-					return;
+					return cullResult_t::CULL_OUT;
 				}
 				else if ( sphereCull == cullResult_t::CULL_IN )
 				{
 					tr.pc.c_sphere_cull_mdv_in++;
-					ent->cull = cullResult_t::CULL_IN;
-					return;
+					return cullResult_t::CULL_IN;
 				}
 				else
 				{
@@ -112,19 +108,16 @@ static void R_CullMDV( mdvModel_t *model, trRefEntity_t *ent )
 	{
 		case cullResult_t::CULL_IN:
 			tr.pc.c_box_cull_mdv_in++;
-			ent->cull = cullResult_t::CULL_IN;
-			return;
+			return cullResult_t::CULL_IN;
 
 		case cullResult_t::CULL_CLIP:
 			tr.pc.c_box_cull_mdv_clip++;
-			ent->cull = cullResult_t::CULL_CLIP;
-			return;
+			return cullResult_t::CULL_CLIP;
 
 		case cullResult_t::CULL_OUT:
 		default:
 			tr.pc.c_box_cull_mdv_out++;
-			ent->cull = cullResult_t::CULL_OUT;
-			return;
+			return cullResult_t::CULL_OUT;
 	}
 }
 
@@ -296,9 +289,7 @@ void R_AddMDVSurfaces( trRefEntity_t *ent )
 
 	// cull the entire model if merged bounding box of both frames
 	// is outside the view frustum.
-	R_CullMDV( model, ent );
-
-	if ( ent->cull == CULL_OUT )
+	if ( R_CullMDV( model, ent ) == CULL_OUT )
 	{
 		return;
 	}

src/engine/renderer/tr_model_iqm.cpp

@@ -930,7 +930,7 @@ bool R_LoadIQModel( model_t *mod, const void *buffer, int filesize,
 R_CullIQM
 =============
 */
-static void R_CullIQM( trRefEntity_t *ent ) {
+static cullResult_t R_CullIQM( trRefEntity_t *ent ) {
 	vec3_t     localBounds[ 2 ];
 	float      scale = ent->e.skeleton.scale;
 	IQModel_t *model = tr.currentModel->iqm;
@@ -962,17 +962,14 @@ static void R_CullIQM( trRefEntity_t *ent ) {
 	{
 	case cullResult_t::CULL_IN:
 		tr.pc.c_box_cull_md5_in++;
-		ent->cull = cullResult_t::CULL_IN;
-		return;
+		return cullResult_t::CULL_IN;
 	case cullResult_t::CULL_CLIP:
 		tr.pc.c_box_cull_md5_clip++;
-		ent->cull = cullResult_t::CULL_CLIP;
-		return;
+		return cullResult_t::CULL_CLIP;
 	case cullResult_t::CULL_OUT:
 	default:
 		tr.pc.c_box_cull_md5_out++;
-		ent->cull = cullResult_t::CULL_OUT;
-		return;
+		return cullResult_t::CULL_OUT;
 	}
 }
 
@@ -999,14 +996,9 @@ void R_AddIQMSurfaces( trRefEntity_t *ent ) {
 	personalModel = (ent->e.renderfx & RF_THIRD_PERSON) &&
 	  tr.viewParms.portalLevel == 0;
 
-	// cull the entire model if merged bounding box of both frames
-	// is outside the view frustum.
-	R_CullIQM( ent );
-
 	// HACK: Never cull first-person models, due to issues with a certain model's bounds
 	// A first-person model not in the player's sight seems like something that should not happen in any case
-	// But R_CullIQM is always called because it sets some fields used by other code
-	if ( ent->cull == cullResult_t::CULL_OUT && !( ent->e.renderfx & RF_FIRST_PERSON ) )
+	if ( !( ent->e.renderfx & RF_FIRST_PERSON ) && R_CullIQM( ent ) == cullResult_t::CULL_OUT )
 	{
 		return;
 	}

src/engine/renderer/tr_world.cpp

@@ -185,9 +185,7 @@ void R_AddBSPModelSurfaces( trRefEntity_t *ent )
 	VectorAdd( ent->worldBounds[ 0 ], ent->worldBounds[ 1 ], boundsCenter );
 	VectorScale( boundsCenter, 0.5f, boundsCenter );
 
-	ent->cull = R_CullBox( ent->worldBounds );
-
-	if ( ent->cull == CULL_OUT )
+	if ( R_CullBox( ent->worldBounds ) == CULL_OUT )
 	{
 		return;
 	}