unify(shader): Merge W3DShaderManager code, move Smudge, W3DSmudge to Core (#1920)

Author: xezon

Core/GameEngine/CMakeLists.txt

@@ -222,7 +222,7 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/Shell.h
 #    Include/GameClient/ShellHooks.h
 #    Include/GameClient/ShellMenuScheme.h
-#    Include/GameClient/Smudge.h
+    Include/GameClient/Smudge.h
 #    Include/GameClient/Snow.h
 #    Include/GameClient/Statistics.h
 #    Include/GameClient/TerrainRoads.h
@@ -827,7 +827,7 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/System/Image.cpp
 #    Source/GameClient/System/ParticleSys.cpp
 #    Source/GameClient/System/RayEffect.cpp
-#    Source/GameClient/System/Smudge.cpp
+    Source/GameClient/System/Smudge.cpp
 #    Source/GameClient/Terrain/TerrainRoads.cpp
 #    Source/GameClient/Terrain/TerrainVisual.cpp
     Source/GameClient/VideoPlayer.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h renamed to Core/GameEngine/Include/GameClient/Smudge.h

@@ -63,7 +63,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Include/W3DDevice/GameClient/W3DShaderManager.h
 #    Include/W3DDevice/GameClient/W3DShadow.h
 #    Include/W3DDevice/GameClient/W3DShroud.h
-#    Include/W3DDevice/GameClient/W3DSmudge.h
+    Include/W3DDevice/GameClient/W3DSmudge.h
 #    Include/W3DDevice/GameClient/W3DSnow.h
 #    Include/W3DDevice/GameClient/W3DStatusCircle.h
 #    Include/W3DDevice/GameClient/W3DTerrainBackground.h
@@ -165,7 +165,7 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameClient/W3DScene.cpp
 #    Source/W3DDevice/GameClient/W3DShaderManager.cpp
 #    Source/W3DDevice/GameClient/W3DShroud.cpp
-#    Source/W3DDevice/GameClient/W3DSmudge.cpp
+    Source/W3DDevice/GameClient/W3DSmudge.cpp
 #    Source/W3DDevice/GameClient/W3DSnow.cpp
 #    Source/W3DDevice/GameClient/W3DStatusCircle.cpp
 #    Source/W3DDevice/GameClient/W3DTerrainBackground.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/System/Smudge.cpp renamed to Core/GameEngine/Source/GameClient/System/Smudge.cpp

@@ -76,6 +76,7 @@ enum FilterTypes CPP_11(: Int)
 	FT_VIEW_BW_FILTER,		//filter to apply a black & white filter to the screen.
 	FT_VIEW_MOTION_BLUR_FILTER, //filter to apply motion blur filter to screen.
 	FT_VIEW_CROSSFADE,				///<filter to apply a cross blend between previous/current views.
+	FT_VIEW_DEFAULT,				///<default filter mode for default filter.
 	FT_MAX
 };
 
@@ -101,7 +102,7 @@ enum FilterModes CPP_11(: Int)
 	FM_VIEW_MB_OUT_SATURATE, // Motion blur filter out saturated blur
 	FM_VIEW_MB_END_PAN_ALPHA, // Moton blur on screen pan (for camera tracks object mode)
 
-
+	FM_VIEW_DEFAULT,	//Default filter that's enabled when all others are off.
 
 	// NOTE: This has to be the last entry in this enum.
 	// Add new entries before this one.  jba.

Core/GameEngineDevice/CMakeLists.txt

@@ -40,6 +40,7 @@ enum CustomScenePassModes CPP_11(: Int);
 enum StaticGameLODLevel CPP_11(: Int);
 enum ChipsetType CPP_11(: Int);
 enum CpuType CPP_11(: Int);
+enum GraphicsVenderID CPP_11(: Int);
 
 class TextureClass;	///forward reference
 /** System for managing complex rendering settings which are either not handled by
@@ -65,6 +66,11 @@ class W3DShaderManager
 		ST_ROAD_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
 		ST_ROAD_BASE_NOISE12,//shader to apply base texture and both cloud/noise
 		ST_CLOUD_TEXTURE,			//shader to project clouds.
+		ST_FLAT_TERRAIN_BASE,	//shader to apply base terrain texture only
+		ST_FLAT_TERRAIN_BASE_NOISE1,	//shader to apply base texture and cloud/noise 1.
+		ST_FLAT_TERRAIN_BASE_NOISE2,	//shader to apply base texture and cloud/noise 2.
+		ST_FLAT_TERRAIN_BASE_NOISE12,//shader to apply base texture and both cloud/noise
+		ST_FLAT_SHROUD_TEXTURE,		//shader to apply shroud texture projection.
 		ST_MAX
 	};
 
@@ -75,8 +81,11 @@ class W3DShaderManager
 	static void updateCloud();	///<update the cloud position once every render frame.
 
 	static ChipsetType getChipset(void);	///<return current device chipset.
+	static GraphicsVenderID getCurrentVendor(void) {return m_currentVendor;}	///<return current card vendor.
+	static __int64 getCurrentDriverVersion(void) {return m_driverVersion; }	///<return current driver version.
 	static Int getShaderPasses(ShaderTypes shader);	///<rendering passes required for shader
 	static Int setShader(ShaderTypes shader, Int pass);	///<enable specific shader pass.
+	static Int setShroudTex(Int stage);	///<Set shroud in a texture stage.
 	static void resetShader(ShaderTypes shader);	///<make sure W3D2 gets restored to normal
 	///Specify all textures (up to 8) which can be accessed by the shaders.
 	static void setTexture(Int stage,TextureClass* texture) {m_Textures[stage]=texture;}
@@ -101,12 +110,15 @@ class W3DShaderManager
 	static void startRenderToTexture(void); ///< Sets render target to texture.
 	static IDirect3DTexture8 * endRenderToTexture(void); ///< Ends render to texture, & returns texture.
 	static IDirect3DTexture8 * getRenderTexture(void);	///< returns last used render target texture
+	static Bool isRenderingToTexture(void) {return m_renderingToTexture; }
 	static void drawViewport(Int color);	///<draws 2 triangles covering the current tactical viewport
 
 
 protected:
 	static TextureClass *m_Textures[8];	///textures assigned to each of the possible stages
 	static ChipsetType m_currentChipset;	///<last video card chipset that was detected.
+	static GraphicsVenderID m_currentVendor;	///<last video card vendor
+	static __int64 m_driverVersion;			///<driver version of last chipset.
 	static ShaderTypes m_currentShader;	///<last shader that was set.
 	static Int m_currentShaderPass;		///<pass of last shader that was set.