diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index b7837d2a58..f98defa94d 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -513,7 +513,7 @@ bool BitmapText::EarlyAbortDraw() const
 void BitmapText::DrawPrimitives()
 {
 	Actor::SetGlobalRenderStates();	// set Actor-specified render states
-	DISPLAY->SetTextureModeModulate();
+	DISPLAY->SetTextureMode( TextureMode_Modulate );
 
 	/* Draw if we're not fully transparent or the zbuffer is enabled */
 	if( m_pTempState->diffuse[0].a != 0 )
@@ -601,7 +601,7 @@ void BitmapText::DrawPrimitives()
 	/* render the glow pass */
 	if( m_pTempState->glow.a > 0.0001f )
 	{
-		DISPLAY->SetTextureModeGlow();
+		DISPLAY->SetTextureMode( TextureMode_Glow );
 
 		for( unsigned i=0; i<m_aVertices.size(); i++ )
 			m_aVertices[i].c = m_pTempState->glow;
@@ -773,7 +773,7 @@ void ColorBitmapText::SimpleAddLine( const RString &sAddition, const int iWidthP
 void ColorBitmapText::DrawPrimitives( )
 {
 	Actor::SetGlobalRenderStates();	// set Actor-specified render states
-	DISPLAY->SetTextureModeModulate();
+	DISPLAY->SetTextureMode( TextureMode_Modulate );
 
 	/* Draw if we're not fully transparent or the zbuffer is enabled */
 	if( m_pTempState->diffuse[0].a != 0 )
@@ -822,7 +822,7 @@ void ColorBitmapText::DrawPrimitives( )
 	/* render the glow pass */
 	if( m_pTempState->glow.a > 0.0001f )
 	{
-		DISPLAY->SetTextureModeGlow();
+		DISPLAY->SetTextureMode( TextureMode_Glow );
 
 		for( unsigned i=0; i<m_aVertices.size(); i++ )
 			m_aVertices[i].c = m_pTempState->glow;
diff --git a/stepmania/src/GraphDisplay.cpp b/stepmania/src/GraphDisplay.cpp
index 730b56ac4a..3d388dadd6 100644
--- a/stepmania/src/GraphDisplay.cpp
+++ b/stepmania/src/GraphDisplay.cpp
@@ -132,7 +132,7 @@ public:
 		// parameters have no effect.
 		Actor::SetTextureRenderStates();
 
-		DISPLAY->SetTextureModeModulate();
+		DISPLAY->SetTextureMode( TextureMode_Modulate );
 		DISPLAY->DrawQuadStrip( m_Slices, ARRAYLEN(m_Slices) );
 	}
 
diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp
index 85e152b9b9..3a90346b67 100644
--- a/stepmania/src/GrooveRadar.cpp
+++ b/stepmania/src/GrooveRadar.cpp
@@ -160,7 +160,7 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
 	const float fRadius = GetUnzoomedWidth()/2.0f*1.1f;
 
 	DISPLAY->ClearAllTextures();
-	DISPLAY->SetTextureModeModulate();
+	DISPLAY->SetTextureMode( TextureMode_Modulate );
 	RageSpriteVertex v[12];	// needed to draw 5 fan primitives and 10 strip primitives
 
 	if( !m_bValuesVisible )
diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index 0555c60314..51581c3278 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -322,7 +322,7 @@ void Model::DrawPrimitives()
 	//////////////////////
 	if( m_pTempState->diffuse[0].a > 0 )
 	{
-		DISPLAY->SetTextureModeModulate();
+		DISPLAY->SetTextureMode( TextureMode_Modulate );
 
 		for( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i )
 		{
@@ -367,7 +367,7 @@ void Model::DrawPrimitives()
 						DISPLAY->SetTexture( TextureUnit_2, mat.alpha.GetCurrentTexture() ? mat.alpha.GetCurrentTexture()->GetTexHandle() : 0 );
 						Actor::SetTextureRenderStates();	// set Actor-specified render states
 						DISPLAY->SetSphereEnvironmentMapping( mat.alpha.m_bSphereMapped );
-						DISPLAY->SetTextureModeAdd();
+						DISPLAY->SetTextureMode( TextureMode_Add );
 						DISPLAY->SetTextureFiltering( true );
 					}
 					else
@@ -434,7 +434,7 @@ void Model::DrawPrimitives()
 	//////////////////////
 	if( m_pTempState->glow.a > 0.0001f )
 	{
-		DISPLAY->SetTextureModeGlow();
+		DISPLAY->SetTextureMode( TextureMode_Glow );
 
 		for( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i )
 		{
diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index e45c7efd82..0a10350f4d 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -515,9 +515,9 @@ void NoteDisplay::DrawHoldBody( const TapNote& tn, int iCol, float fBeat, bool b
 	}
 
 	if( bGlow )
-		DISPLAY->SetTextureModeGlow();
+		DISPLAY->SetTextureMode( TextureMode_Glow );
 	else
-		DISPLAY->SetTextureModeModulate();
+		DISPLAY->SetTextureMode( TextureMode_Modulate );
 
 	const bool bWavyPartsNeedZBuffer = ArrowEffects::NeedZBuffer( m_pPlayerState );
 	DISPLAY->SetZTestMode( bWavyPartsNeedZBuffer?ZTEST_WRITE_ON_PASS:ZTEST_OFF );
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index 1285e0481d..775034e71e 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -503,7 +503,7 @@ void Sprite::DrawTexture( const TweenState *state )
 		state->diffuse[2].a > 0 ||
 		state->diffuse[3].a > 0 )
 	{
-		DISPLAY->SetTextureModeModulate();
+		DISPLAY->SetTextureMode( TextureMode_Modulate );
 
 		//////////////////////
 		// render the shadow
@@ -532,7 +532,7 @@ void Sprite::DrawTexture( const TweenState *state )
 	//////////////////////
 	if( state->glow.a > 0.0001f )
 	{
-		DISPLAY->SetTextureModeGlow();
+		DISPLAY->SetTextureMode( TextureMode_Glow );
 		v[0].c = v[1].c = v[2].c = v[3].c = state->glow;
 		DISPLAY->DrawQuad( v );
 	}