Backup and restore device state

#305

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 7348 
+#define BUILD_NUMBER 7349 

ddraw/IDirect3DDeviceX.cpp

@@ -4380,9 +4380,26 @@ HRESULT m_IDirect3DDeviceX::BackupStates()
 	// Backup viewport
 	(*d3d9Device)->GetViewport(&backup.viewport);
 
+	backup.IsBackedUp = true;
+
 	return D3D_OK;
 }
 
+HRESULT m_IDirect3DDeviceX::RestoreTextures()
+{
+	if (!d3d9Device || !*d3d9Device)
+	{
+		Logging::Log() << __FUNCTION__ " Error: Failed to get the device state!";
+		return DDERR_GENERIC;
+	}
+
+	// Restore textures
+	for (UINT y = 0; y < MaxTextureStages; y++)
+	{
+		SetTexture(y, AttachedTexture[y]);
+	}
+}
+
 HRESULT m_IDirect3DDeviceX::RestoreStates()
 {
 	if (!d3d9Device || !*d3d9Device)
@@ -4391,6 +4408,11 @@ HRESULT m_IDirect3DDeviceX::RestoreStates()
 		return DDERR_GENERIC;
 	}
 
+	if (!backup.IsBackedUp)
+	{
+		return D3D_OK;
+	}
+
 	// Restore render states
 	for (UINT x = 0; x < 255; x++)
 	{
@@ -4430,14 +4452,24 @@ HRESULT m_IDirect3DDeviceX::RestoreStates()
 		}
 	}
 
+	// Restore textures
+	RestoreTextures();
+
 	// Restore viewport
+	D3DVIEWPORT9 viewport = {};
+	(*d3d9Device)->GetViewport(&viewport);
+	backup.viewport.Width = viewport.Width;
+	backup.viewport.Height = viewport.Height;
 	(*d3d9Device)->SetViewport(&backup.viewport);
 
+	backup.IsBackedUp = false;
+
 	return D3D_OK;
 }
 
 void m_IDirect3DDeviceX::BeforeResetDevice()
 {
+	BackupStates();
 	if (IsRecordingState)
 	{
 		DWORD dwBlockHandle = NULL;
@@ -4450,7 +4482,7 @@ void m_IDirect3DDeviceX::BeforeResetDevice()
 
 void m_IDirect3DDeviceX::AfterResetDevice()
 {
-	bSetDefaults = true;
+	RestoreStates();
 }
 
 void m_IDirect3DDeviceX::ClearDdraw()

ddraw/IDirect3DDeviceX.h

@@ -33,6 +33,7 @@ class m_IDirect3DDeviceX : public IUnknown, public AddressLookupTableDdrawObject
 #endif
 
 	struct {
+		bool IsBackedUp = false;
 		DWORD RenderState[255] = {};
 		DWORD TextureState[MaxTextureStages][255] = {};
 		DWORD SamplerState[MaxTextureStages][14] = {};
@@ -340,6 +341,7 @@ class m_IDirect3DDeviceX : public IUnknown, public AddressLookupTableDdrawObject
 	}
 	void ClearDdraw();
 	void BeforeResetDevice();
+	HRESULT RestoreTextures();
 	void AfterResetDevice();
 	void ReleaseAllStateBlocks();
 };

ddraw/IDirectDrawX.cpp

@@ -4635,8 +4635,15 @@ HRESULT m_IDirectDrawX::DrawPrimarySurface()
 	} while (false);
 
 	// Reset textures
-	d3d9Device->SetTexture(0, nullptr);
-	d3d9Device->SetTexture(1, nullptr);
+	if (D3DDeviceInterface)
+	{
+		D3DDeviceInterface->RestoreTextures();
+	}
+	else
+	{
+		d3d9Device->SetTexture(0, nullptr);
+		d3d9Device->SetTexture(1, nullptr);
+	}
 
 	// Reset pixel shader
 	d3d9Device->SetPixelShader(nullptr);