From e9a2bdc83f6799e6c1b4094913045ac039193f18 Mon Sep 17 00:00:00 2001
From: narzoul <narzoul@users.noreply.github.com>
Date: Sat, 9 Jan 2021 12:13:57 +0100
Subject: [PATCH] Remove deleted textures from device state

Fixes flickering black box during SimCity 4 videos (issue #85).
---
 DDrawCompat/D3dDdi/Device.cpp      |  1 +
 DDrawCompat/D3dDdi/DeviceState.cpp | 63 +++++++++++++++++-------------
 DDrawCompat/D3dDdi/DeviceState.h   |  2 +
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/DDrawCompat/D3dDdi/Device.cpp b/DDrawCompat/D3dDdi/Device.cpp
index 33f9c1e..dd133ab 100644
--- a/DDrawCompat/D3dDdi/Device.cpp
+++ b/DDrawCompat/D3dDdi/Device.cpp
@@ -258,6 +258,7 @@ namespace D3dDdi
 				g_gdiResource = nullptr;
 			}
 			m_drawPrimitive.removeSysMemVertexBuffer(resource);
+			m_state.removeTexture(resource);
 		}
 
 		return result;
diff --git a/DDrawCompat/D3dDdi/DeviceState.cpp b/DDrawCompat/D3dDdi/DeviceState.cpp
index b5192ea..9be6498 100644
--- a/DDrawCompat/D3dDdi/DeviceState.cpp
+++ b/DDrawCompat/D3dDdi/DeviceState.cpp
@@ -3,6 +3,9 @@
 
 namespace
 {
+	const UINT UNINITIALIZED_STATE = 0xBAADBAAD;
+	const HANDLE UNINITIALIZED_HANDLE = reinterpret_cast<HANDLE>(0xBAADBAAD);
+
 	bool operator==(const D3DDDIARG_ZRANGE& lhs, const D3DDDIARG_ZRANGE& rhs)
 	{
 		return lhs.MinZ == rhs.MinZ && lhs.MaxZ == rhs.MaxZ;
@@ -18,17 +21,17 @@ namespace D3dDdi
 {
 	DeviceState::DeviceState(Device& device)
 		: m_device(device)
-		, m_pixelShader(nullptr)
-		, m_textures{}
-		, m_vertexShaderDecl(nullptr)
-		, m_vertexShaderFunc(nullptr)
+		, m_pixelShader(UNINITIALIZED_HANDLE)
+		, m_vertexShaderDecl(UNINITIALIZED_HANDLE)
+		, m_vertexShaderFunc(UNINITIALIZED_HANDLE)
 		, m_wInfo{ NAN, NAN }
 		, m_zRange{ NAN, NAN }
 	{
-		m_renderState.fill(0xBAADBAAD);
+		m_renderState.fill(UNINITIALIZED_STATE);
+		m_textures.fill(UNINITIALIZED_HANDLE);
 		for (UINT i = 0; i < m_textureStageState.size(); ++i)
 		{
-			m_textureStageState[i].fill(0xBAADBAAD);
+			m_textureStageState[i].fill(UNINITIALIZED_STATE);
 		}
 	}
 
@@ -80,7 +83,8 @@ namespace D3dDdi
 			return m_device.getOrigVtable().pfnSetTexture(m_device, stage, texture);
 		}
 
-		if (texture == m_textures[stage])
+		if (texture == m_textures[stage] &&
+			texture != UNINITIALIZED_HANDLE)
 		{
 			return S_OK;
 		}
@@ -90,31 +94,23 @@ namespace D3dDdi
 		if (SUCCEEDED(result))
 		{
 			m_textures[stage] = texture;
-			m_textureStageState[stage][D3DDDITSS_DISABLETEXTURECOLORKEY] = 0xBAADBAAD;
+			m_textureStageState[stage][D3DDDITSS_DISABLETEXTURECOLORKEY] = UNINITIALIZED_STATE;
+			m_textureStageState[stage][D3DDDITSS_TEXTURECOLORKEYVAL] = UNINITIALIZED_STATE;
 		}
 		return result;
 	}
 
 	HRESULT DeviceState::pfnSetTextureStageState(const D3DDDIARG_TEXTURESTAGESTATE* data)
 	{
-		if (D3DDDITSS_TEXTURECOLORKEYVAL == data->State)
+		switch (data->State)
 		{
-			if (0 != m_textureStageState[data->Stage][D3DDDITSS_DISABLETEXTURECOLORKEY])
-			{
-				m_textureStageState[data->Stage][D3DDDITSS_DISABLETEXTURECOLORKEY] = 0;
-			}
-			else if (data->Value == m_textureStageState[data->Stage][D3DDDITSS_TEXTURECOLORKEYVAL])
-			{
-				return S_OK;
-			}
+		case D3DDDITSS_DISABLETEXTURECOLORKEY:
+			m_textureStageState[data->Stage][D3DDDITSS_TEXTURECOLORKEYVAL] = UNINITIALIZED_STATE;
+			break;
 
-			m_device.flushPrimitives();
-			HRESULT result = m_device.getOrigVtable().pfnSetTextureStageState(m_device, data);
-			if (SUCCEEDED(result))
-			{
-				m_textureStageState[data->Stage][D3DDDITSS_TEXTURECOLORKEYVAL] = data->Value;
-			}
-			return result;
+		case D3DDDITSS_TEXTURECOLORKEYVAL:
+			m_textureStageState[data->Stage][D3DDDITSS_DISABLETEXTURECOLORKEY] = UNINITIALIZED_STATE;
+			break;
 		}
 		return setStateArray(data, m_textureStageState[data->Stage], m_device.getOrigVtable().pfnSetTextureStageState);
 	}
@@ -170,15 +166,27 @@ namespace D3dDdi
 		HRESULT result = origDeleteShaderFunc(m_device, shader);
 		if (SUCCEEDED(result) && shader == currentShader)
 		{
-			currentShader = nullptr;
+			currentShader = UNINITIALIZED_HANDLE;
 		}
 		return result;
 	}
 
+	void DeviceState::removeTexture(HANDLE texture)
+	{
+		for (UINT i = 0; i < m_textures.size(); ++i)
+		{
+			if (m_textures[i] == texture)
+			{
+				m_textures[i] = UNINITIALIZED_HANDLE;
+			}
+		}
+	}
+
 	HRESULT DeviceState::setShader(HANDLE shader, HANDLE& currentShader,
 		HRESULT(APIENTRY* origSetShaderFunc)(HANDLE, HANDLE))
 	{
-		if (shader == currentShader)
+		if (shader == currentShader &&
+			shader != UNINITIALIZED_HANDLE)
 		{
 			return S_OK;
 		}
@@ -244,7 +252,8 @@ namespace D3dDdi
 			return origSetState(m_device, data);
 		}
 
-		if (data->Value == currentState[data->State])
+		if (data->Value == currentState[data->State] &&
+			data->Value != UNINITIALIZED_STATE)
 		{
 			return S_OK;
 		}
diff --git a/DDrawCompat/D3dDdi/DeviceState.h b/DDrawCompat/D3dDdi/DeviceState.h
index fdf7931..7876e02 100644
--- a/DDrawCompat/D3dDdi/DeviceState.h
+++ b/DDrawCompat/D3dDdi/DeviceState.h
@@ -30,6 +30,8 @@ namespace D3dDdi
 		HRESULT pfnSetZRange(const D3DDDIARG_ZRANGE* data);
 		HRESULT pfnUpdateWInfo(const D3DDDIARG_WINFO* data);
 
+		void removeTexture(HANDLE texture);
+
 	private:
 		typedef std::tuple<FLOAT, FLOAT, FLOAT, FLOAT> ShaderConstF;
 		typedef std::tuple<INT, INT, INT, INT> ShaderConstI;