tr_surface: parallel MD3 model loading

Author: illwieckz

src/engine/renderer/tr_surface.cpp

@@ -822,56 +822,47 @@ Defines ATTR_POSITION, ATTR_TEXCOORD, and maybe ATTR_QTANGENT
 */
 static void Tess_SurfaceMDV( mdvSurface_t *srf )
 {
-	int           i, j;
-	int           numIndexes = 0;
-	int           numVertexes;
-	mdvXyz_t      *oldVert, *newVert;
-	mdvNormal_t   *oldNormal, *newNormal;
-	mdvSt_t       *st;
-	srfTriangle_t *tri;
-	float         backlerp;
-	float         oldXyzScale, newXyzScale;
-
 	GLIMP_LOGCOMMENT( "--- Tess_SurfaceMDV ---" );
 
-	if ( backEnd.currentEntity->e.oldframe == backEnd.currentEntity->e.frame )
-	{
-		backlerp = 0;
-	}
-	else
+	float backlerp = 0.0f;
+
+	if ( backEnd.currentEntity->e.oldframe != backEnd.currentEntity->e.frame )
 	{
 		backlerp = backEnd.currentEntity->e.backlerp;
 	}
 
-	newXyzScale = ( 1.0f - backlerp );
-	oldXyzScale = backlerp;
+	float newXyzScale = ( 1.0f - backlerp );
+	float oldXyzScale = backlerp;
 
 	Tess_CheckOverflow( srf->numVerts, srf->numTriangles * 3 );
 
-	numIndexes = srf->numTriangles * 3;
+	int numIndexes = srf->numTriangles * 3;
 
-	for ( i = 0, tri = srf->triangles; i < srf->numTriangles; i++, tri++ )
 	{
-		tess.indexes[ tess.numIndexes + i * 3 + 0 ] = tess.numVertexes + tri->indexes[ 0 ];
-		tess.indexes[ tess.numIndexes + i * 3 + 1 ] = tess.numVertexes + tri->indexes[ 1 ];
-		tess.indexes[ tess.numIndexes + i * 3 + 2 ] = tess.numVertexes + tri->indexes[ 2 ];
+		srfTriangle_t *tri = srf->triangles;
+		for ( size_t i = 0; i < srf->numTriangles; i++, tri++ )
+		{
+			tess.indexes[ tess.numIndexes + i * 3 + 0 ] = tess.numVertexes + tri->indexes[ 0 ];
+			tess.indexes[ tess.numIndexes + i * 3 + 1 ] = tess.numVertexes + tri->indexes[ 1 ];
+			tess.indexes[ tess.numIndexes + i * 3 + 2 ] = tess.numVertexes + tri->indexes[ 2 ];
+		}
 	}
 
-	newVert = srf->verts + ( backEnd.currentEntity->e.frame * srf->numVerts );
-	oldVert = srf->verts + ( backEnd.currentEntity->e.oldframe * srf->numVerts );
-	newNormal = srf->normals + ( backEnd.currentEntity->e.frame * srf->numVerts );
-	oldNormal = srf->normals + ( backEnd.currentEntity->e.oldframe * srf->numVerts );
-	st = srf->st;
+	mdvXyz_t *newVert = srf->verts + ( backEnd.currentEntity->e.frame * srf->numVerts );
+	mdvXyz_t *oldVert = srf->verts + ( backEnd.currentEntity->e.oldframe * srf->numVerts );
+	mdvNormal_t *newNormal = srf->normals + ( backEnd.currentEntity->e.frame * srf->numVerts );
+	mdvNormal_t *oldNormal = srf->normals + ( backEnd.currentEntity->e.oldframe * srf->numVerts );
+	mdvSt_t *st = srf->st;
 
-	numVertexes = srf->numVerts;
+	int numVertexes = srf->numVerts;
 
 	if (tess.skipTangents)
 	{
-		for (j = 0; j < numVertexes; j++, newVert++, oldVert++, st++)
+		for ( size_t j = 0; j < numVertexes; j++, newVert++, oldVert++, st++ )
 		{
 			vec3_t tmpVert;
 
-			if (backlerp == 0)
+			if ( backlerp == 0.0f )
 			{
 				// just copy
 				VectorCopy(newVert->xyz, tmpVert);
@@ -894,25 +885,17 @@ static void Tess_SurfaceMDV( mdvSurface_t *srf )
 	else
 	{
 		// calc tangent spaces
-		float       *v;
-		const float *v0, *v1, *v2;
-		const float *t0, *t1, *t2;
-		vec3_t* xyz;
-		vec3_t      tangent, *tangents;
-		vec3_t      binormal, *binormals;
-		vec3_t      *normals;
+		vec3_t *xyz = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof(vec3_t) );
+		vec3_t *tangents = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof( vec3_t ) );
+		vec3_t *binormals = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof( vec3_t ) );
+		vec3_t *normals = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof( vec3_t ) );
 
-		xyz = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof(vec3_t) );
-		tangents = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof( vec3_t ) );
-		binormals = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof( vec3_t ) );
-		normals = (vec3_t *)ri.Hunk_AllocateTempMemory( numVertexes * sizeof( vec3_t ) );
-
-		for ( i = 0; i < numVertexes; i++, newVert++, oldVert++, oldNormal++, newNormal++ )
+		for ( size_t i = 0; i < numVertexes; i++, newVert++, oldVert++, oldNormal++, newNormal++ )
 		{
 			VectorClear( tangents[ i ] );
 			VectorClear( binormals[ i ] );
 
-			if ( backlerp == 0 )
+			if ( backlerp == 0.0f )
 			{
 				// just copy
 				VectorCopy( newNormal->normal, normals[ i ] );
@@ -925,7 +908,7 @@ static void Tess_SurfaceMDV( mdvSurface_t *srf )
 				VectorNormalizeFast( normals[ i ] );
 			}
 
-			if ( backlerp == 0 )
+			if ( backlerp == 0.0f )
 			{
 				// just copy
 				VectorCopy(newVert->xyz, xyz[i]);
@@ -938,32 +921,37 @@ static void Tess_SurfaceMDV( mdvSurface_t *srf )
 			}
 		}
 
-		for (i = 0, tri = srf->triangles; i < srf->numTriangles; i++, tri++)
+		auto task0 = [&]( const size_t& i ) -> void
 		{
-			int* indices = tri->indexes;
-			v0 = xyz[ indices[0] ];
-			v1 = xyz[ indices[1] ];
-			v2 = xyz[ indices[2] ];
+			srfTriangle_t *tri = srf->triangles + i;
+			int *indices = tri->indexes;
+			const float *v0 = xyz[ indices[ 0 ] ];
+			const float *v1 = xyz[ indices[ 1 ] ];
+			const float *v2 = xyz[ indices[ 2 ] ];
 
-			t0 = st[ indices[ 0 ] ].st;
-			t1 = st[ indices[ 1 ] ].st;
-			t2 = st[ indices[ 2 ] ].st;
+			const float *t0 = st[ indices[ 0 ] ].st;
+			const float *t1 = st[ indices[ 1 ] ].st;
+			const float *t2 = st[ indices[ 2 ] ].st;
 
+			vec3_t tangent, binormal;
 			R_CalcTangents( tangent, binormal, v0, v1, v2, t0, t1, t2 );
 
-			for ( j = 0; j < 3; j++ )
+			for ( size_t j = 0; j < 3; j++ )
 			{
+				float *v;
+
 				v = tangents[ indices[ j ]  ];
 				VectorAdd( v, tangent, v );
 
 				v = binormals[ indices[ j ] ];
 				VectorAdd( v, binormal, v );
 			}
-		}
+		};
 
-		for ( i = 0; i < numVertexes; i++ )
-		{
+		Omp::Tasker( task0, srf->numTriangles );
 
+		auto task1 = [&]( const size_t& i ) -> void
+		{
 			i16vec4_t qtangents;
 
 			R_TBNtoQtangents( tangents[ i ], binormals[ i ],
@@ -973,7 +961,9 @@ static void Tess_SurfaceMDV( mdvSurface_t *srf )
 			Vector4Copy(qtangents, tess.verts[tess.numVertexes + i].qtangents);
 			tess.verts[tess.numVertexes + i].texCoords[0] = st[i].st[0];
 			tess.verts[tess.numVertexes + i].texCoords[1] = st[i].st[1];
-		}
+		};
+
+		Omp::Tasker( task1, numVertexes );
 
 		ri.Hunk_FreeTempMemory( normals );
 		ri.Hunk_FreeTempMemory( binormals );