From b09b91279711ce13f54af2363023c39f47cc1524 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Mon, 16 Aug 2021 15:33:49 +0100
Subject: [PATCH] [d3d9] Fix unbinding textures

Closes: #2236
---
 src/d3d9/d3d9_device.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
index 22c4439f..83a97c3d 100644
--- a/src/d3d9/d3d9_device.cpp
+++ b/src/d3d9/d3d9_device.cpp
@@ -5918,13 +5918,14 @@ namespace dxvk {
         FlushBuffer(vbo);
     }
 
-    const uint32_t usedSamplerMask = m_activeTextures & (m_psShaderMasks.samplerMask | m_vsShaderMasks.samplerMask);
+    const uint32_t usedSamplerMask = m_psShaderMasks.samplerMask | m_vsShaderMasks.samplerMask;
+    const uint32_t usedTextureMask = m_activeTextures & usedSamplerMask;
 
-    const uint32_t texturesToUpload = m_activeTexturesToUpload & usedSamplerMask;
+    const uint32_t texturesToUpload = m_activeTexturesToUpload & usedTextureMask;
     if (unlikely(texturesToUpload != 0))
       UploadManagedTextures(texturesToUpload);
 
-    const uint32_t texturesToGen = m_activeTexturesToGen & usedSamplerMask;
+    const uint32_t texturesToGen = m_activeTexturesToGen & usedTextureMask;
     if (unlikely(texturesToGen != 0))
       GenerateTextureMips(texturesToGen);
 
@@ -5940,7 +5941,7 @@ namespace dxvk {
     if (m_flags.test(D3D9DeviceFlag::DirtyViewportScissor))
       BindViewportAndScissor();
 
-    const uint32_t activeDirtySamplers = m_dirtySamplerStates & usedSamplerMask;
+    const uint32_t activeDirtySamplers = m_dirtySamplerStates & usedTextureMask;
     if (activeDirtySamplers)
       UndirtySamplers(activeDirtySamplers);
 
@@ -6034,7 +6035,7 @@ namespace dxvk {
       UpdateFixedFunctionPS();
     }
 
-    const uint32_t depthTextureMask = m_depthTextures & usedSamplerMask;
+    const uint32_t depthTextureMask = m_depthTextures & usedTextureMask;
     if (depthTextureMask != m_lastSamplerDepthMode)
       UpdateSamplerDepthModeSpecConstant(depthTextureMask);