From 5688c27610f2a6d67b62e8f90f689e3c1d90a953 Mon Sep 17 00:00:00 2001
From: Yuriy O'Donnell <yuriyo@gmail.com>
Date: Wed, 17 Dec 2014 20:31:08 +0100
Subject: [PATCH] D3D: Moved setting texture by slot mask into StateManager

---
 Source/Core/VideoBackends/D3D/D3DState.cpp     | 11 +++++++++++
 Source/Core/VideoBackends/D3D/D3DState.h       |  3 ++-
 Source/Core/VideoBackends/D3D/TextureCache.cpp |  8 +-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp
index ff4b547e28ee..d4d98e35b834 100644
--- a/Source/Core/VideoBackends/D3D/D3DState.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DState.cpp
@@ -215,6 +215,17 @@ u32 StateManager::UnsetTexture(ID3D11ShaderResourceView* srv)
 	return mask;
 }
 
+void StateManager::SetTextureByMask(u32 textureSlotMask, ID3D11ShaderResourceView* srv)
+{
+	while (textureSlotMask)
+	{
+		unsigned long index;
+		_BitScanForward(&index, textureSlotMask);
+		SetTexture(index, srv);
+		textureSlotMask &= ~(1 << index);
+	}
+}
+
 }  // namespace D3D
 
 ID3D11SamplerState* StateCache::Get(SamplerState state)
diff --git a/Source/Core/VideoBackends/D3D/D3DState.h b/Source/Core/VideoBackends/D3D/D3DState.h
index e53c99790841..5c22d2673390 100644
--- a/Source/Core/VideoBackends/D3D/D3DState.h
+++ b/Source/Core/VideoBackends/D3D/D3DState.h
@@ -235,7 +235,8 @@ class StateManager
 	}
 
 	// removes currently set texture from all slots, returns mask of previously bound slots
-	u32 StateManager::UnsetTexture(ID3D11ShaderResourceView* srv);
+	u32 UnsetTexture(ID3D11ShaderResourceView* srv);
+	void SetTextureByMask(u32 textureSlotMask, ID3D11ShaderResourceView* srv);
 
 	// call this immediately before any drawing operation or to explicitly apply pending resource state changes
 	void Apply();
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp
index e679398d500a..3661155f37dc 100644
--- a/Source/Core/VideoBackends/D3D/TextureCache.cpp
+++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp
@@ -174,13 +174,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 		g_renderer->RestoreAPIState();
 
 		// Restore old texture in all previously used slots, if any
-		while (textureSlotMask)
-		{
-			unsigned long index;
-			_BitScanForward(&index, textureSlotMask);
-			D3D::stateman->SetTexture(index, texture->GetSRV());
-			textureSlotMask &= ~(1 << index);
-		}
+		D3D::stateman->SetTextureByMask(textureSlotMask, texture->GetSRV());
 	}
 
 	if (!g_ActiveConfig.bCopyEFBToTexture)