From f0177268b457b0c4cb01cd3f1b77f2d244b7aca5 Mon Sep 17 00:00:00 2001
From: kaetemi <devnull@localhost>
Date: Tue, 10 Sep 2013 19:53:41 +0200
Subject: [PATCH] Rename of a d3d specific class

---
 .../src/3d/driver/direct3d/driver_direct3d.h  | 58 +++++++++----------
 .../direct3d/driver_direct3d_shader.cpp       | 16 ++---
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.h b/code/nel/src/3d/driver/direct3d/driver_direct3d.h
index b3a8f5f37..3e2d2cdc9 100644
--- a/code/nel/src/3d/driver/direct3d/driver_direct3d.h
+++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.h
@@ -215,11 +215,11 @@ public:
  * **********************************
  */
 // --------------------------------------------------
-class CShader
+class CD3DShaderFX
 {
 public:
-	CShader();
-	~CShader();
+	CD3DShaderFX();
+	~CD3DShaderFX();
 
 	// Load a shader file
 	bool loadShaderFile (const char *filename);
@@ -1236,7 +1236,7 @@ public:
 	  * ColorOp[n] = DISABLE;
 	  * AlphaOp[n] = DISABLE;
     */
-	bool			activeShader(CShader *shd);
+	bool			activeShader(CD3DShaderFX *shd);
 
 	// Bench
 	virtual void startBench (bool wantStandardDeviation = false, bool quick = false, bool reset = true);
@@ -2165,7 +2165,7 @@ public:
 	void releaseInternalShaders();
 	bool setShaderTexture (uint textureHandle, ITexture *texture, CFXCache *cache);
 
-	bool validateShader(CShader *shader);
+	bool validateShader(CD3DShaderFX *shader);
 
 	void activePass (uint pass)
 	{
@@ -2573,7 +2573,7 @@ private:
 	CIndexBuffer			_QuadIndexesAGP;
 
 	// The last setuped shader
-	CShader					*_CurrentShader;
+	CD3DShaderFX					*_CurrentShader;
 	UINT					_CurrentShaderPassCount;
 public:
 	struct CTextureRef
@@ -2598,29 +2598,29 @@ private:
 	CRenderVariable			*_ModifiedRenderState;
 
 	// Internal shaders
-	CShader					_ShaderLightmap0;
-	CShader					_ShaderLightmap1;
-	CShader					_ShaderLightmap2;
-	CShader					_ShaderLightmap3;
-	CShader					_ShaderLightmap4;
-	CShader					_ShaderLightmap0Blend;
-	CShader					_ShaderLightmap1Blend;
-	CShader					_ShaderLightmap2Blend;
-	CShader					_ShaderLightmap3Blend;
-	CShader					_ShaderLightmap4Blend;
-	CShader					_ShaderLightmap0X2;
-	CShader					_ShaderLightmap1X2;
-	CShader					_ShaderLightmap2X2;
-	CShader					_ShaderLightmap3X2;
-	CShader					_ShaderLightmap4X2;
-	CShader					_ShaderLightmap0BlendX2;
-	CShader					_ShaderLightmap1BlendX2;
-	CShader					_ShaderLightmap2BlendX2;
-	CShader					_ShaderLightmap3BlendX2;
-	CShader					_ShaderLightmap4BlendX2;
-	CShader					_ShaderCloud;
-	CShader					_ShaderWaterNoDiffuse;
-	CShader					_ShaderWaterDiffuse;
+	CD3DShaderFX					_ShaderLightmap0;
+	CD3DShaderFX					_ShaderLightmap1;
+	CD3DShaderFX					_ShaderLightmap2;
+	CD3DShaderFX					_ShaderLightmap3;
+	CD3DShaderFX					_ShaderLightmap4;
+	CD3DShaderFX					_ShaderLightmap0Blend;
+	CD3DShaderFX					_ShaderLightmap1Blend;
+	CD3DShaderFX					_ShaderLightmap2Blend;
+	CD3DShaderFX					_ShaderLightmap3Blend;
+	CD3DShaderFX					_ShaderLightmap4Blend;
+	CD3DShaderFX					_ShaderLightmap0X2;
+	CD3DShaderFX					_ShaderLightmap1X2;
+	CD3DShaderFX					_ShaderLightmap2X2;
+	CD3DShaderFX					_ShaderLightmap3X2;
+	CD3DShaderFX					_ShaderLightmap4X2;
+	CD3DShaderFX					_ShaderLightmap0BlendX2;
+	CD3DShaderFX					_ShaderLightmap1BlendX2;
+	CD3DShaderFX					_ShaderLightmap2BlendX2;
+	CD3DShaderFX					_ShaderLightmap3BlendX2;
+	CD3DShaderFX					_ShaderLightmap4BlendX2;
+	CD3DShaderFX					_ShaderCloud;
+	CD3DShaderFX					_ShaderWaterNoDiffuse;
+	CD3DShaderFX					_ShaderWaterDiffuse;
 
 
 	// Backup frame buffer
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp
index 300cfe4b7..5cc6c283c 100644
--- a/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp
+++ b/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp
@@ -29,7 +29,7 @@ namespace NL3D
 
 // ***************************************************************************
 
-CShader::~CShader()
+CD3DShaderFX::~CD3DShaderFX()
 {
 	// Must kill the drv mirror of this shader.
 	_DrvInfo.kill();
@@ -37,14 +37,14 @@ CShader::~CShader()
 
 // ***************************************************************************
 
-CShader::CShader()
+CD3DShaderFX::CD3DShaderFX()
 {
 	_ShaderChanged = true;
 }
 
 // ***************************************************************************
 
-void CShader::setText (const char *text)
+void CD3DShaderFX::setText (const char *text)
 {
 	_Text = text;
 	_ShaderChanged = true;
@@ -52,7 +52,7 @@ void CShader::setText (const char *text)
 
 // ***************************************************************************
 
-void CShader::setName (const char *name)
+void CD3DShaderFX::setName (const char *name)
 {
 	_Name = name;
 	_ShaderChanged = true;
@@ -60,7 +60,7 @@ void CShader::setName (const char *name)
 
 // ***************************************************************************
 
-bool CShader::loadShaderFile (const char *filename)
+bool CD3DShaderFX::loadShaderFile (const char *filename)
 {
 	_Text = "";
 	// Lookup
@@ -354,7 +354,7 @@ CShaderDrvInfosD3D::~CShaderDrvInfosD3D()
 
 // ***************************************************************************
 
-bool CDriverD3D::validateShader(CShader *shader)
+bool CDriverD3D::validateShader(CD3DShaderFX *shader)
 {
 	H_AUTO_D3D(CDriverD3D_validateShader)
 	CShaderDrvInfosD3D *shaderInfo = static_cast<CShaderDrvInfosD3D*>((IShaderDrvInfos*)shader->_DrvInfo);
@@ -416,7 +416,7 @@ bool CDriverD3D::validateShader(CShader *shader)
 
 // ***************************************************************************
 
-bool CDriverD3D::activeShader(CShader *shd)
+bool CDriverD3D::activeShader(CD3DShaderFX *shd)
 {
 	H_AUTO_D3D(CDriverD3D_activeShader)
 	if (_DisableHardwarePixelShader)
@@ -482,7 +482,7 @@ bool CDriverD3D::activeShader(CShader *shd)
 }
 
 
-static void setFX(CShader &s, const char *name, const char *prog, CDriverD3D *drv)
+static void setFX(CD3DShaderFX &s, const char *name, const char *prog, CDriverD3D *drv)
 {
 	H_AUTO_D3D(setFX)