Fix the const things for d3d drivers.

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

source/Irrlicht/CD3D8Driver.cpp

@@ -67,10 +67,6 @@ CD3D8Driver::~CD3D8Driver()
 {
 	deleteMaterialRenders();
 
-	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		if (CurrentTexture[i])
-			CurrentTexture[i]->drop();
-
 	// drop d3d8
 
 	if (pID3DDevice)
@@ -460,10 +456,7 @@ bool CD3D8Driver::reset()
 	LastVertexType = (E_VERTEX_TYPE)-1;
 
 	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-	{
-		if (CurrentTexture[i]) CurrentTexture[i]->drop();
-			CurrentTexture[i] = 0;
-	}
+		CurrentTexture[i] = 0;
 
 	setVertexShader(EVT_STANDARD);
 	setRenderStates3DMode();
@@ -608,9 +601,6 @@ bool CD3D8Driver::setTexture(s32 stage, video::ITexture* texture)
 		return false;
 	}
 
-	if (CurrentTexture[stage])
-		CurrentTexture[stage]->drop();
-
 	CurrentTexture[stage] = texture;
 
 	if (!texture)
@@ -620,8 +610,7 @@ bool CD3D8Driver::setTexture(s32 stage, video::ITexture* texture)
 	}
 	else
 	{
-		pID3DDevice->SetTexture(stage, ((CD3D8Texture*)texture)->getDX8Texture());
-		texture->grab();
+		pID3DDevice->SetTexture(stage, ((const CD3D8Texture*)texture)->getDX8Texture());
 	}
 	return true;
 }

source/Irrlicht/CD3D8Driver.h

@@ -263,7 +263,7 @@ namespace video
 		bool ResetRenderStates; // bool to make all renderstates be reseted if set.
 		bool Transformation3DChanged;
 		bool StencilBuffer;
-		ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
+		const ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
 		core::matrix4 Matrices[ETS_COUNT]; // matrices of the 3d mode we need to restore when we switch back from the 2d mode.
 
 		HINSTANCE D3DLibrary;

source/Irrlicht/CD3D8Texture.cpp

@@ -345,7 +345,7 @@ u32 CD3D8Texture::getPitch() const
 
 
 //! returns the DIRECT3D8 Texture
-IDirect3DTexture8* CD3D8Texture::getDX8Texture()
+IDirect3DTexture8* CD3D8Texture::getDX8Texture() const
 {
 	return Texture;
 }

source/Irrlicht/CD3D8Texture.h

@@ -58,7 +58,7 @@ public:
 	virtual u32 getPitch() const;
 
 	//! returns the DIRECT3D8 Texture
-	IDirect3DTexture8* getDX8Texture();
+	IDirect3DTexture8* getDX8Texture() const;
 
 	//! returns if texture has mipmap levels
 	bool hasMipMaps() const;

source/Irrlicht/CD3D9Driver.cpp

@@ -70,10 +70,6 @@ CD3D9Driver::~CD3D9Driver()
 {
 	deleteMaterialRenders();
 
-	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-		if (CurrentTexture[i])
-			CurrentTexture[i]->drop();
-
 	// drop d3d9
 
 	if (pID3DDevice)
@@ -612,7 +608,7 @@ void CD3D9Driver::setTransform(E_TRANSFORMATION_STATE state, const core::matrix4
 
 
 //! sets the current Texture
-bool CD3D9Driver::setTexture(s32 stage, video::ITexture* texture)
+bool CD3D9Driver::setTexture(s32 stage, const video::ITexture* texture)
 {
 	if (CurrentTexture[stage] == texture)
 		return true;
@@ -623,9 +619,6 @@ bool CD3D9Driver::setTexture(s32 stage, video::ITexture* texture)
 		return false;
 	}
 
-	if (CurrentTexture[stage])
-		CurrentTexture[stage]->drop();
-
 	CurrentTexture[stage] = texture;
 
 	if (!texture)
@@ -635,9 +628,7 @@ bool CD3D9Driver::setTexture(s32 stage, video::ITexture* texture)
 	}
 	else
 	{
-		pID3DDevice->SetTexture(stage, ((CD3D9Texture*)texture)->getDX9Texture());
-		texture->grab();
-
+		pID3DDevice->SetTexture(stage, ((const CD3D9Texture*)texture)->getDX9Texture());
 	}
 	return true;
 }
@@ -1920,12 +1911,7 @@ bool CD3D9Driver::reset()
 	LastVertexType = (E_VERTEX_TYPE)-1;
 
 	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-	{
-		if (CurrentTexture[i])
-			CurrentTexture[i]->drop();
-
 		CurrentTexture[i] = 0;
-	}
 
 	setVertexShader(EVT_STANDARD);
 	setRenderStates3DMode();

source/Irrlicht/CD3D9Driver.h

@@ -219,7 +219,7 @@ namespace video
 		void setRenderStatesStencilShadowMode(bool zfail);
 
 		//! sets the current Texture
-		bool setTexture(s32 stage, video::ITexture* texture);
+		bool setTexture(s32 stage, const video::ITexture* texture);
 
 		//! resets the device
 		bool reset();
@@ -270,7 +270,7 @@ namespace video
 		bool ResetRenderStates; // bool to make all renderstates be reseted if set.
 		bool Transformation3DChanged;
 		bool StencilBuffer;
-		ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
+		const ITexture* CurrentTexture[MATERIAL_MAX_TEXTURES];
 		bool LastTextureMipMapsAvailable[MATERIAL_MAX_TEXTURES];
 		core::matrix4 Matrices[ETS_COUNT]; // matrizes of the 3d mode we need to restore when we switch back from the 2d mode.
 

source/Irrlicht/CD3D9Texture.cpp

@@ -552,7 +552,7 @@ u32 CD3D9Texture::getPitch() const
 
 
 //! returns the DIRECT3D9 Texture
-IDirect3DTexture9* CD3D9Texture::getDX9Texture()
+IDirect3DTexture9* CD3D9Texture::getDX9Texture() const
 {
 	return Texture;
 }

source/Irrlicht/CD3D9Texture.h

@@ -57,7 +57,7 @@ public:
 	virtual u32 getPitch() const;
 
 	//! returns the DIRECT3D9 Texture
-	IDirect3DTexture9* getDX9Texture();
+	IDirect3DTexture9* getDX9Texture() const;
 
 	//! returns if texture has mipmap levels
 	bool hasMipMaps() const;