cvar-test

Author: illwieckz

src/engine/renderer/tr_surface.cpp

@@ -43,8 +43,7 @@ use the shader system.
 
 static transform_t bones[ MAX_BONES ];
 
-// Do not multithread loops not calling R_TBNtoQtangents().
-#define NO_MT_IF_NO_TBNTOQ 1
+Cvar::Cvar<bool> r_parallelNotbntoq( "r_parallelNotbntoq", "r_parallelNotbntoq", Cvar::NONE, true );
 
 template <typename T> void surfaceTasker( const T& task, const size_t& amount )
 {
@@ -1082,7 +1081,7 @@ static void Tess_SurfaceMD5( md5Surface_t *srf )
 	// Deform the vertices by the lerped bones.
 	if ( tess.skipTangents )
 	{
-#if NO_MT_IF_NO_TBNTOQ
+if ( !r_parallelNotbntoq.Get() ) {
 		for ( ; tessVertex < lastVertex; tessVertex++,
 			surfaceVertex++ )
 		{
@@ -1106,7 +1105,7 @@ static void Tess_SurfaceMD5( md5Surface_t *srf )
 
 			Vector2Copy( surfaceVertex->texCoords, tessVertex->texCoords );
 		}
-#else
+} else {
 		auto task = [&]( size_t chunk_index ) -> void
 		{
 			size_t chunk_offset = chunk_index * chunk_size;
@@ -1147,7 +1146,7 @@ static void Tess_SurfaceMD5( md5Surface_t *srf )
 		};
 
 		surfaceTasker( task, num_chunks );
-#endif
+}
 	}
 	else
 	{
@@ -1342,7 +1341,7 @@ void Tess_SurfaceIQM( srfIQModel_t *surf ) {
 			byte *modelBlendIndex = model->blendIndexes + 4 * firstVertex;
 			byte *modelBlendWeight = model->blendWeights + 4 * firstVertex;
 
-#if NO_MT_IF_NO_TBNTOQ
+if ( !r_parallelNotbntoq.Get() ) {
 			for ( ; tessVertex < lastVertex; tessVertex++,
 				modelPosition += 3, modelNormal += 3,
 				modelTangent += 3, modelBitangent += 3,
@@ -1371,7 +1370,7 @@ void Tess_SurfaceIQM( srfIQModel_t *surf ) {
 
 				Vector2Copy( modelTexcoord, tessVertex->texCoords );
 			}
-#else
+} else {
 			auto task = [&]( const size_t& chunk_index ) -> void
 			{
 				size_t chunk_offset = chunk_index * chunk_size;
@@ -1423,7 +1422,7 @@ void Tess_SurfaceIQM( srfIQModel_t *surf ) {
 			};
 
 			surfaceTasker( task, num_chunks );
-#endif
+}
 		}
 		else
 		{