Convert some VideoCommon stuff to BitSet.

Now with a minor performance improvement removed for no reason.

1 files changed, 20 insertions, 23 deletions

diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp
index d637ad9017..7a18ba435b 100644
--- a/Source/Core/VideoCommon/VertexManagerBase.cpp
+++ b/Source/Core/VideoCommon/VertexManagerBase.cpp
@@ -180,39 +180,36 @@ void VertexManager::Flush()
 		(int)bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff);
 #endif
 
-	u32 usedtextures = 0;
+	BitSet32 usedtextures;
 	for (u32 i = 0; i < bpmem.genMode.numtevstages + 1u; ++i)
 		if (bpmem.tevorders[i / 2].getEnable(i & 1))
-			usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
+			usedtextures[bpmem.tevorders[i/2].getTexMap(i & 1)] = true;
 
 	if (bpmem.genMode.numindstages > 0)
 		for (unsigned int i = 0; i < bpmem.genMode.numtevstages + 1u; ++i)
 			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt);
+				usedtextures[bpmem.tevindref.getTexMap(bpmem.tevind[i].bt)] = true;
 
-	for (unsigned int i = 0; i < 8; i++)
+	for (unsigned int i : usedtextures)
 	{
-		if (usedtextures & (1 << i))
+		g_renderer->SetSamplerState(i & 3, i >> 2);
+		const FourTexUnits &tex = bpmem.tex[i >> 2];
+		const TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i,
+			(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
+			tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
+			tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9,
+			tex.texTlut[i&3].tlut_format,
+			((tex.texMode0[i&3].min_filter & 3) != 0),
+			(tex.texMode1[i&3].max_lod + 0xf) / 0x10,
+			(tex.texImage1[i&3].image_type != 0));
+
+		if (tentry)
 		{
-			g_renderer->SetSamplerState(i & 3, i >> 2);
-			const FourTexUnits &tex = bpmem.tex[i >> 2];
-			const TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i,
-				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
-				tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
-				tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9,
-				tex.texTlut[i&3].tlut_format,
-				((tex.texMode0[i&3].min_filter & 3) != 0),
-				(tex.texMode1[i&3].max_lod + 0xf) / 0x10,
-				(tex.texImage1[i&3].image_type != 0));
-
-			if (tentry)
-			{
-				// 0s are probably for no manual wrapping needed.
-				PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
-			}
-			else
-				ERROR_LOG(VIDEO, "error loading texture");
+			// 0s are probably for no manual wrapping needed.
+			PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
 		}
+		else
+			ERROR_LOG(VIDEO, "error loading texture");
 	}
 
 	// set global constants