Working version of the d3d device lost patch. It might need some more working...

Working version of the d3d device lost patch. It might need some more working for VBOs, but RTTs are now properly released before reset().

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1624 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CD3D8Driver.cpp

@@ -398,11 +398,15 @@ bool CD3D8Driver::beginScene(bool backBuffer, bool zBuffer, SColor color,
 	{
 		if(FAILED(hr = pID3DDevice->TestCooperativeLevel()))
 		{
+			if (hr == D3DERR_DEVICELOST)
+			{
+				Sleep(100);
+				hr = pID3DDevice->TestCooperativeLevel();
 				if (hr == D3DERR_DEVICELOST)
 					return false;
+			}
 
-			if (hr == D3DERR_DEVICENOTRESET)
-				reset();
+			if ((hr == D3DERR_DEVICENOTRESET) && !reset())
 				return false;
 		}
 	}
@@ -433,40 +437,6 @@ bool CD3D8Driver::beginScene(bool backBuffer, bool zBuffer, SColor color,
 }
 
 
-//! resets the device
-bool CD3D8Driver::reset()
-{
-	// reset
-	HRESULT hr;
-	os::Printer::log("Resetting D3D8 device.", ELL_INFORMATION);
-	if (FAILED(hr = pID3DDevice->Reset(&present)))
-	{
-		if (hr == D3DERR_DEVICELOST)
-		{
-			DeviceLost = true;
-			os::Printer::log("Resetting failed due to device lost.", ELL_WARNING);
-		}
-		else
-			os::Printer::log("Resetting failed.", ELL_WARNING);
-		return false;
-	}
-
-	DeviceLost = false;
-	ResetRenderStates = true;
-	LastVertexType = (E_VERTEX_TYPE)-1;
-
-	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		CurrentTexture[i] = 0;
-
-	setVertexShader(EVT_STANDARD);
-	setRenderStates3DMode();
-	setFog(FogColor, LinearFog, FogStart, FogEnd, FogDensity, PixelFog, RangeFog);
-	setAmbientLight(AmbientLight);
-
-	return true;
-}
-
-
 //! applications must call this method after performing any rendering. returns false if failed.
 bool CD3D8Driver::endScene()
 {
@@ -492,17 +462,67 @@ bool CD3D8Driver::endScene()
 
 	hr = pID3DDevice->Present(srcRct, NULL, (HWND)WindowId, NULL);
 
+	if (SUCCEEDED(hr))
+		return true;
+
 	if (hr == D3DERR_DEVICELOST)
 	{
 		DeviceLost = true;
 		os::Printer::log("DIRECT3D8 device lost.", ELL_WARNING);
 	}
 	else
-	if (FAILED(hr) && hr != D3DERR_INVALIDCALL)
-	{
 		os::Printer::log("DIRECT3D8 present failed.", ELL_WARNING);
 	return false;
+}
+
+
+//! resets the device
+bool CD3D8Driver::reset()
+{
+	u32 i;
+	os::Printer::log("Resetting D3D8 device.", ELL_INFORMATION);
+
+	for (i=0; i<Textures.size(); ++i)
+	{
+		if (Textures[i].Surface->isRenderTarget())
+		{
+			IDirect3DTexture8* tex = ((CD3D8Texture*)(Textures[i].Surface))->getDX8Texture();
+			if (tex)
+				tex->Release();
 		}
+	}
+
+	HRESULT hr = pID3DDevice->Reset(&present);
+
+	for (i=0; i<Textures.size(); ++i)
+	{
+		if (Textures[i].Surface->isRenderTarget())
+			((CD3D8Texture*)(Textures[i].Surface))->createRenderTarget();
+	}
+
+	if (FAILED(hr))
+	{
+		if (hr == D3DERR_DEVICELOST)
+		{
+			DeviceLost = true;
+			os::Printer::log("Resetting failed due to device lost.", ELL_WARNING);
+		}
+		else
+			os::Printer::log("Resetting failed.", ELL_WARNING);
+		return false;
+	}
+
+	DeviceLost = false;
+	ResetRenderStates = true;
+	LastVertexType = (E_VERTEX_TYPE)-1;
+
+	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
+		CurrentTexture[i] = 0;
+
+	setVertexShader(EVT_STANDARD);
+	setRenderStates3DMode();
+	setFog(FogColor, LinearFog, FogStart, FogEnd, FogDensity, PixelFog, RangeFog);
+	setAmbientLight(AmbientLight);
 
 	return true;
 }

source/Irrlicht/CD3D9Driver.cpp

@@ -2245,13 +2245,14 @@ void CD3D9Driver::draw3DLine(const core::vector3df& start,
 //! resets the device
 bool CD3D9Driver::reset()
 {
+	u32 i;
 	os::Printer::log("Resetting D3D9 device.", ELL_INFORMATION);
 
-	for (u32 i=0; i<Textures.size(); ++i)
+	for (i=0; i<Textures.size(); ++i)
 	{
 		if (Textures[i].Surface->isRenderTarget())
 		{
-			IDirect3DTexture9 tex = ((CD3D9Texture*)(Textures[i].Surface))->getDX9Texture();
+			IDirect3DTexture9* tex = ((CD3D9Texture*)(Textures[i].Surface))->getDX9Texture();
 			if (tex)
 				tex->Release();
 		}
@@ -2259,7 +2260,7 @@ bool CD3D9Driver::reset()
 
 	HRESULT hr = pID3DDevice->Reset(&present);
 
-	for (u32 i=0; i<Textures.size(); ++i)
+	for (i=0; i<Textures.size(); ++i)
 	{
 		if (Textures[i].Surface->isRenderTarget())
 			((CD3D9Texture*)(Textures[i].Surface))->createRenderTarget();