GL3: Remove GL_ATI_texture_env_combine3 and GL_ATIX_texture_env_route

--HG--
branch : opengl3

code/nel/src/3d/driver/opengl3/driver_opengl.cpp

@@ -1191,8 +1191,8 @@ void CDriverGL3::checkForPerPixelLightingSupport()
 	// TODO : support for EnvCombine3
 	// TODO : support for less than 3 stages
 
-	_SupportPerPixelShaderNoSpec = _Extensions.ATITextureEnvCombine3 && _Extensions.ARBTextureCubeMap && _Extensions.NbTextureStages >= 3;
+	_SupportPerPixelShaderNoSpec = true; // FIXME GL3
-	_SupportPerPixelShader = _Extensions.ATITextureEnvCombine3 && _Extensions.ARBTextureCubeMap && _Extensions.NbTextureStages >= 2;
+	_SupportPerPixelShader = true; // FIXME GL3
 }
 
 // ***************************************************************************
@@ -1538,7 +1538,7 @@ bool CDriverGL3::supportMADOperator() const
 {
 	H_AUTO_OGL(CDriverGL3_supportMADOperator)
 
-	return _Extensions.ATITextureEnvCombine3;
+	return true;
 }
 
 // ***************************************************************************

code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp

@@ -576,32 +576,6 @@ static bool	setupEXTSeparateSpecularColor(const char	*glext)
 	return true;
 }
 
-// *********************************
-static bool	setupATITextureEnvCombine3(const char	*glext)
-{
-	H_AUTO_OGL(setupATITextureEnvCombine3);
-
-// reenabled to allow bloom on mac, TODO: cleanly fix the water issue
-// i think this issue was mtp target related - is this the case in ryzom too?
-// #ifdef NL_OS_MAC
-// // Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled
-// 	return false;
-// #endif
-
-	CHECK_EXT("GL_ATI_texture_env_combine3");
-	return true;
-}
-
-// *********************************
-static bool	setupATIXTextureEnvRoute(const char * /* glext */)
-{
-	H_AUTO_OGL(setupATIXTextureEnvRoute);
-	return false;
-//	CHECK_EXT("GL_ATIX_texture_env_route");
-//	return true;
-}
-
-
 // *********************************
 static bool	setupARBTextureCubeMap(const char	*glext)
 {
@@ -1036,14 +1010,6 @@ void	registerGlExtensions(CGlExtensions &ext)
 
 	// Check GL_EXT_packed_depth_stencil
 	ext.PackedDepthStencil = setupPackedDepthStencil(glext);
-
-	// ATI extensions
-	// -------------
-
-	// Check ATIXTextureEnvCombine3.
-	ext.ATITextureEnvCombine3= setupATITextureEnvCombine3(glext);
-	// Check ATIXTextureEnvRoute
-	ext.ATIXTextureEnvRoute= setupATIXTextureEnvRoute(glext);
 }
 
 

code/nel/src/3d/driver/opengl3/driver_opengl_extension.h

@@ -71,10 +71,6 @@ struct	CGlExtensions
 	bool	GLXSGISwapControl;
 	bool	GLXMESASwapControl;
 
-	// ATI Extensions.
-	bool	ATITextureEnvCombine3;
-	bool	ATIXTextureEnvRoute;
-
 	// ARB Extensions
 	bool	ARBTextureCompression;
 	bool	ARBTextureNonPowerOfTwo;
@@ -90,8 +86,6 @@ public:
 		EXTTextureCompressionS3TC= false;
 		EXTVertexWeighting= false;
 		EXTSeparateSpecularColor= false;
-		ATITextureEnvCombine3= false;
-		ATIXTextureEnvRoute= false;
 		ARBTextureCubeMap= false;
 		EXTSecondaryColor= false;
 		WGLARBPBuffer= false;
@@ -125,8 +119,6 @@ public:
 		result += ARBMultiTexture ? "ARBMultiTexture " : "";
 		result += ARBTextureCompression ? "ARBTextureCompression " : "";
 		result += EXTTextureCompressionS3TC ? "EXTTextureCompressionS3TC " : "";
-		result += ATITextureEnvCombine3 ? "ATITextureEnvCombine3 " : "";
-		result += ATIXTextureEnvRoute ? "ATITextureEnvRoute " : "";
 		result += ARBTextureCubeMap ? "ARBTextureCubeMap " : "";
 		result += NVTextureRectangle ? "NVTextureRectangle " : "";
 		result += EXTTextureRectangle ? "EXTTextureRectangle " : "";

code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp

@@ -1388,11 +1388,11 @@ bool CDriverGL3::activateTexture(uint stage, ITexture *tex)
 			// setup texture mode, after activeTextureARB()
 			_DriverGLStates.setTextureMode(CDriverGLStates3::TextureDisabled);
 
-			if (_Extensions.ATITextureEnvCombine3)
+			/*if (_Extensions.ATITextureEnvCombine3)
 			{
 				// very strange bug with ATI cards : when a texture is set to NULL at a stage, the stage is still active sometimes...
 				activateTexEnvMode(stage, _TexEnvReplace); // set the whole stage to replace fix the problem
-			}
+			}*/
 		}
 
 		this->_CurrentTexture[stage]= tex;