Optimizations to when rendering api calls are done. Results in 60%+ b…

…oost in performance in high actor/mesh count scenarios, and ~20% in real world scenarios when not GPU limited.

src/ActorMultiTexture.cpp

@@ -97,7 +97,6 @@ void ActorMultiTexture::DrawPrimitives()
 	quadVerticies.top    = -m_size.y/2.0f;
 	quadVerticies.bottom = +m_size.y/2.0f;
 
-	DISPLAY->ClearAllTextures();
 	for( size_t i = 0; i < m_aTextureUnits.size(); ++i )
 	{
 		TextureUnit tu = enum_add2(TextureUnit_1, i);
@@ -130,7 +129,8 @@ void ActorMultiTexture::DrawPrimitives()
 	for( size_t i = 0; i < m_aTextureUnits.size(); ++i )
 		DISPLAY->SetTexture( enum_add2(TextureUnit_1, i), 0 );
 
-	DISPLAY->SetEffectMode( EffectMode_Normal );
+	if ( m_EffectMode != EffectMode_Normal )
+		DISPLAY->SetEffectMode(EffectMode_Normal);
 }
 
 bool ActorMultiTexture::EarlyAbortDraw() const

src/ActorMultiVertex.cpp

@@ -218,7 +218,6 @@ void ActorMultiVertex::DrawPrimitives()
 {
 	Actor::SetGlobalRenderStates();	// set Actor-specified render states
 
-	DISPLAY->ClearAllTextures();
 	DISPLAY->SetTexture( TextureUnit_1, _Texture->GetTexHandle() );
 
 	Actor::SetTextureRenderStates();
@@ -330,7 +329,8 @@ void ActorMultiVertex::DrawInternal( const AMV_TweenState *TS )
 			break;
 	}
 
-	DISPLAY->SetEffectMode( EffectMode_Normal );
+	if ( _EffectMode != EffectMode_Normal )
+		DISPLAY->SetEffectMode(EffectMode_Normal);
 }
 
 bool ActorMultiVertex::EarlyAbortDraw() const

src/BitmapText.cpp

@@ -424,7 +424,6 @@ void BitmapText::DrawChars( bool bUseStrokeTexture )
 	bool haveTextures = false;
 	int startingPoint = iStartGlyph;
 
-	DISPLAY->ClearAllTextures();
 	for ( int start = iStartGlyph; start < iEndGlyph; )
 	{
 		int end = start;
@@ -465,7 +464,6 @@ void BitmapText::DrawChars( bool bUseStrokeTexture )
 			DISPLAY->DrawQuads(&m_aVertices[startingPoint * 4], (end - startingPoint) * 4);
 
 			// Setup for the next render pass
-			DISPLAY->ClearAllTextures();
 			startingPoint = end;
 			haveTextures = false;
 		}

src/GraphDisplay.cpp

@@ -26,8 +26,6 @@ class GraphLine: public Actor
 	{
 		Actor::SetGlobalRenderStates();	// set Actor-specified render states
 
-		DISPLAY->ClearAllTextures();
-
 		// Must call this after setting the texture or else texture 
 		// parameters have no effect.
 		Actor::SetTextureRenderStates();
@@ -133,7 +131,6 @@ class GraphBody: public Actor
 	{
 		Actor::SetGlobalRenderStates();	// set Actor-specified render states
 
-		DISPLAY->ClearAllTextures();
 		DISPLAY->SetTexture( TextureUnit_1, m_pTexture->GetTexHandle() );
 
 		// Must call this after setting the texture or else texture 

src/GrooveRadar.cpp

@@ -146,7 +146,6 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
 	// draw radar filling
 	const float fRadius = GetUnzoomedWidth()/2.0f*1.1f;
 
-	DISPLAY->ClearAllTextures();
 	DISPLAY->SetTextureMode( TextureUnit_1, TextureMode_Modulate );
 	RageSpriteVertex v[12]; // needed to draw 5 fan primitives and 10 strip primitives
 

src/Model.cpp

@@ -418,7 +418,6 @@ void Model::DrawPrimitives()
 				static const RageColor specular( 0.2f,0.2f,0.2f,1 );
 				static const float shininess = 1;
 				DISPLAY->SetMaterial( emissive, ambient, diffuse, specular, shininess );
-				DISPLAY->ClearAllTextures();
 				DISPLAY->SetSphereEnvironmentMapping( TextureUnit_1, false );
 				DrawMesh( i );
 			}
@@ -445,18 +444,13 @@ void Model::DrawPrimitives()
 			float shininess = 1;
 
 			DISPLAY->SetMaterial( emissive, ambient, diffuse, specular, shininess );
-			DISPLAY->ClearAllTextures();
 
 			if( pMesh->nMaterialIndex != -1 )
 			{
 				msMaterial& mat = m_Materials[ pMesh->nMaterialIndex ];
 				DISPLAY->SetTexture( TextureUnit_1, mat.diffuse.GetCurrentTexture() ? mat.diffuse.GetCurrentTexture()->GetTexHandle() : 0 );
 				Actor::SetTextureRenderStates();	// set Actor-specified render states
 			}
-			else
-			{
-				// hey why is this otherwise empty else block here? -aj
-			}
 
 			DrawMesh( i );
 		}

src/NoteDisplay.cpp

@@ -789,8 +789,6 @@ void NoteDisplay::DrawHoldPart(vector<Sprite*> &vpSpr,
 		}
 	}
 
-	DISPLAY->ClearAllTextures();
-
 	const float fTexCoordLeft	= rect.left;
 	const float fTexCoordRight	= rect.right;
 	const float fTexCoordCenter	= (fTexCoordLeft+fTexCoordRight)/2;

src/RageDisplay_D3D.cpp

@@ -45,6 +45,7 @@ D3DCAPS9			g_DeviceCaps;
 D3DDISPLAYMODE		g_DesktopMode;
 D3DPRESENT_PARAMETERS	g_d3dpp;
 int					g_ModelMatrixCnt=0;
+DWORD				lastFVF = 0;
 static bool		g_bSphereMapping[NUM_TextureUnit] = { false, false };
 
 // Need default color and depth buffer to restore them after using render targets
@@ -715,70 +716,79 @@ const VideoModeParams* RageDisplay_D3D::GetActualVideoModeParams() const
 
 void RageDisplay_D3D::SendCurrentMatrices()
 {
-	RageMatrix m;
-	RageMatrixMultiply( &m, GetCentering(), GetProjectionTop() );
+	static RageMatrix Centering;
+	static RageMatrix Projection;
 
-	if (g_bInvertY)
-	{
-		RageMatrix flip;
-		RageMatrixScale(&flip, +1, -1, +1);
-		RageMatrixMultiply(&m, &flip, &m);
-	}
-
-	// Convert to OpenGL-style "pixel-centered" coords
-	RageMatrix m2 = GetCenteringMatrix( -0.5f, -0.5f, 0, 0 );
-	RageMatrix projection;
-	RageMatrixMultiply( &projection, &m2, &m );
-	g_pd3dDevice->SetTransform( D3DTS_PROJECTION, (D3DMATRIX*)&projection );
-
-	g_pd3dDevice->SetTransform( D3DTS_VIEW, (D3DMATRIX*)GetViewTop() );
-	g_pd3dDevice->SetTransform( D3DTS_WORLD, (D3DMATRIX*)GetWorldTop() );
-
-	FOREACH_ENUM( TextureUnit, tu )
+	if ( Centering != *GetCentering() || Projection != *GetProjectionTop() )
 	{
-		// Optimization opportunity: Turn off texture transform if not using texture coords.
-		g_pd3dDevice->SetTextureStageState( tu, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2 );
+		Centering = *GetCentering();
+		Projection = *GetProjectionTop();
 
-		// If no texture is set for this texture unit, don't bother setting it up.
-		IDirect3DBaseTexture9* pTexture = NULL;
-		g_pd3dDevice->GetTexture( tu, &pTexture );
-		if( pTexture == NULL )
-			 continue;
-		pTexture->Release();
+		RageMatrix m;
+		RageMatrixMultiply( &m, GetCentering(), GetProjectionTop() );
 
-		if( g_bSphereMapping[tu] )
+		if ( g_bInvertY )
 		{
-			static const RageMatrix tex = RageMatrix
-			(
-				0.5f,   0.0f,  0.0f, 0.0f,
-				0.0f,  -0.5f,  0.0f, 0.0f,
-				0.0f,   0.0f,  0.0f, 0.0f,
-				0.5f,  -0.5f,  0.0f, 1.0f
-			);
-			g_pd3dDevice->SetTransform( (D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+tu), (D3DMATRIX*)&tex );
-
-			// Tell D3D to use transformed reflection vectors as texture co-ordinate 0
-			// and then transform this coordinate by the specified texture matrix.
-			g_pd3dDevice->SetTextureStageState( tu, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR );
+			RageMatrix flip;
+			RageMatrixScale( &flip, +1, -1, +1 );
+			RageMatrixMultiply( &m, &flip, &m );
 		}
-		else
+
+		// Convert to OpenGL-style "pixel-centered" coords
+		RageMatrix m2 = GetCenteringMatrix( -0.5f, -0.5f, 0, 0 );
+		RageMatrix projection;
+		RageMatrixMultiply( &projection, &m2, &m );
+		g_pd3dDevice->SetTransform( D3DTS_PROJECTION, (D3DMATRIX*)&projection );
+
+		g_pd3dDevice->SetTransform( D3DTS_VIEW, (D3DMATRIX*)GetViewTop() );
+		g_pd3dDevice->SetTransform( D3DTS_WORLD, (D3DMATRIX*)GetWorldTop() );
+
+		FOREACH_ENUM( TextureUnit, tu )
 		{
-			/* Direct3D is expecting a 3x3 matrix loaded into the 4x4 in order
-			 * to transform the 2-component texture coordinates. We currently
-			 * only use translate and scale, and ignore the z component entirely,
-			 * so convert the texture matrix from 4x4 to 3x3 by dropping z. */
-
-			const RageMatrix &tex1 = *GetTextureTop();
-			const RageMatrix tex2 = RageMatrix
-			(
-				tex1.m[0][0], tex1.m[0][1],  tex1.m[0][3],	0,
-				tex1.m[1][0], tex1.m[1][1],  tex1.m[1][3],	0,
-				tex1.m[3][0], tex1.m[3][1],  tex1.m[3][3],	0,
-				0,				0,			0,		0
-			);
-			g_pd3dDevice->SetTransform( D3DTRANSFORMSTATETYPE(D3DTS_TEXTURE0+tu), (D3DMATRIX*)&tex2 );
-
-			g_pd3dDevice->SetTextureStageState( tu, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU );
+			// If no texture is set for this texture unit, don't bother setting it up.
+			IDirect3DBaseTexture9* pTexture = NULL;
+			g_pd3dDevice->GetTexture( tu, &pTexture );
+			if (pTexture == NULL)
+				continue;
+			pTexture->Release();
+
+			// Optimization opportunity: Turn off texture transform if not using texture coords.
+			g_pd3dDevice->SetTextureStageState(tu, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
+
+			if ( g_bSphereMapping[tu] )
+			{
+				static const RageMatrix tex = RageMatrix
+				(
+					0.5f, 0.0f, 0.0f, 0.0f,
+					0.0f, -0.5f, 0.0f, 0.0f,
+					0.0f, 0.0f, 0.0f, 0.0f,
+					0.5f, -0.5f, 0.0f, 1.0f
+				);
+				g_pd3dDevice->SetTransform( (D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0 + tu), (D3DMATRIX*)&tex );
+
+				// Tell D3D to use transformed reflection vectors as texture co-ordinate 0
+				// and then transform this coordinate by the specified texture matrix.
+				g_pd3dDevice->SetTextureStageState( tu, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR );
+			}
+			else
+			{
+				/* Direct3D is expecting a 3x3 matrix loaded into the 4x4 in order
+				* to transform the 2-component texture coordinates. We currently
+				* only use translate and scale, and ignore the z component entirely,
+				* so convert the texture matrix from 4x4 to 3x3 by dropping z. */
+
+				const RageMatrix &tex1 = *GetTextureTop();
+				const RageMatrix tex2 = RageMatrix
+				(
+					tex1.m[0][0], tex1.m[0][1], tex1.m[0][3], 0,
+					tex1.m[1][0], tex1.m[1][1], tex1.m[1][3], 0,
+					tex1.m[3][0], tex1.m[3][1], tex1.m[3][3], 0,
+					0, 0, 0, 0
+				);
+				g_pd3dDevice->SetTransform( D3DTRANSFORMSTATETYPE(D3DTS_TEXTURE0 + tu), (D3DMATRIX*)&tex2 );
+
+				g_pd3dDevice->SetTextureStageState( tu, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_PASSTHRU );
+			}
 		}
 	}
 }
@@ -825,7 +835,12 @@ class RageCompiledGeometrySWD3D : public RageCompiledGeometry
 			g_pd3dDevice->SetTransform( D3DTS_TEXTURE0, (D3DMATRIX*)&m );
 		}
 
-		g_pd3dDevice->SetFVF( D3DFVF_RageModelVertex );
+		if ( lastFVF != D3DFVF_RageModelVertex )
+		{
+			lastFVF = D3DFVF_RageModelVertex;
+			g_pd3dDevice->SetFVF( D3DFVF_RageModelVertex );
+		}
+
 		g_pd3dDevice->DrawIndexedPrimitiveUP(
 			D3DPT_TRIANGLELIST,			// PrimitiveType
 			meshInfo.iVertexStart,		// MinIndex
@@ -875,7 +890,12 @@ void RageDisplay_D3D::DrawQuadsInternal( const RageSpriteVertex v[], int iNumVer
 		vIndices[i*6+5] = i*4+0;
 	}
 
-	g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	if ( lastFVF != D3DFVF_RageSpriteVertex )
+	{
+		lastFVF = D3DFVF_RageSpriteVertex;
+		g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	}
+
 	SendCurrentMatrices();
 	g_pd3dDevice->DrawIndexedPrimitiveUP(
 		D3DPT_TRIANGLELIST, // PrimitiveType
@@ -911,7 +931,12 @@ void RageDisplay_D3D::DrawQuadStripInternal( const RageSpriteVertex v[], int iNu
 		vIndices[i*6+5] = i*2+3;
 	}
 
-	g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	if ( lastFVF != D3DFVF_RageSpriteVertex )
+	{
+		lastFVF = D3DFVF_RageSpriteVertex;
+		g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	}
+
 	SendCurrentMatrices();
 	g_pd3dDevice->DrawIndexedPrimitiveUP(
 		D3DPT_TRIANGLELIST, // PrimitiveType
@@ -953,7 +978,12 @@ void RageDisplay_D3D::DrawSymmetricQuadStripInternal( const RageSpriteVertex v[]
 		vIndices[i*12+11] = i*3+5;
 	}
 
-	g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	if ( lastFVF != D3DFVF_RageSpriteVertex )
+	{
+		lastFVF = D3DFVF_RageSpriteVertex;
+		g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	}
+
 	SendCurrentMatrices();
 	g_pd3dDevice->DrawIndexedPrimitiveUP(
 		D3DPT_TRIANGLELIST, // PrimitiveType
@@ -969,7 +999,12 @@ void RageDisplay_D3D::DrawSymmetricQuadStripInternal( const RageSpriteVertex v[]
 
 void RageDisplay_D3D::DrawFanInternal( const RageSpriteVertex v[], int iNumVerts )
 {
-	g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	if ( lastFVF != D3DFVF_RageSpriteVertex )
+	{
+		lastFVF = D3DFVF_RageSpriteVertex;
+		g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	}
+
 	SendCurrentMatrices();
 	g_pd3dDevice->DrawPrimitiveUP(
 		D3DPT_TRIANGLEFAN, // PrimitiveType
@@ -981,7 +1016,12 @@ void RageDisplay_D3D::DrawFanInternal( const RageSpriteVertex v[], int iNumVerts
 
 void RageDisplay_D3D::DrawStripInternal( const RageSpriteVertex v[], int iNumVerts )
 {
-	g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	if ( lastFVF != D3DFVF_RageSpriteVertex )
+	{
+		lastFVF = D3DFVF_RageSpriteVertex;
+		g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	}
+
 	SendCurrentMatrices();
 	g_pd3dDevice->DrawPrimitiveUP(
 		D3DPT_TRIANGLESTRIP, // PrimitiveType
@@ -993,7 +1033,12 @@ void RageDisplay_D3D::DrawStripInternal( const RageSpriteVertex v[], int iNumVer
 
 void RageDisplay_D3D::DrawTrianglesInternal( const RageSpriteVertex v[], int iNumVerts )
 {
-	g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	if ( lastFVF != D3DFVF_RageSpriteVertex )
+	{
+		lastFVF = D3DFVF_RageSpriteVertex;
+		g_pd3dDevice->SetFVF( D3DFVF_RageSpriteVertex );
+	}
+
 	SendCurrentMatrices();
 	g_pd3dDevice->DrawPrimitiveUP(
 		D3DPT_TRIANGLELIST, // PrimitiveType