diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index 923853c81..41483b832 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -1378,11 +1378,6 @@ void registerGlExtensions(CGlExtensions &ext) // Check ATIXTextureEnvRoute ext.ATIXTextureEnvRoute= setupATIXTextureEnvRoute(glext); - if (ext.ATITextureEnvCombine3) - { - ext.IsATI9500OrAbove = setupARBFragmentProgram(glext); - } - // ARB extensions // ------------- if(!ext.DisableHardwareVertexArrayAGP) @@ -1390,8 +1385,6 @@ void registerGlExtensions(CGlExtensions &ext) ext.ARBVertexBufferObject = setupARBVertexBufferObject(glext); } - ext.IsGeforceFXOrAbove = setupNVVertexProgram(glext) && setupARBFragmentProgram(glext); - // fix for radeon 7200 -> disable agp if (ext.NbTextureStages == 3 && (ext.ATIVertexArrayObject || ext.ARBVertexBufferObject)) { diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h index eea1eab36..39df658ff 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.h +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.h @@ -115,11 +115,6 @@ struct CGlExtensions bool ARBVertexProgram; bool ARBTextureNonPowerOfTwo; - // hint : is it an ATI 9500 or above ? - bool IsATI9500OrAbove; - // hint : is it a GeForce FX or above ? - bool IsGeforceFXOrAbove; - public: /// \name Disable Hardware feature. False by default. setuped by IDriver @@ -182,18 +177,12 @@ public: DisableHardwareVertexProgram= false; DisableHardwareVertexArrayAGP= false; DisableHardwareTextureShader= false; - - // misc - IsATI9500OrAbove = false; - IsGeforceFXOrAbove = false; }; std::string toString() { std::string result = "OpenGL version "; result += Version1_2 ? "1.2 or above(*)" : "1.1 or below"; - result += IsATI9500OrAbove ? "; ATI9500 or better" : ""; - result += IsGeforceFXOrAbove ? "; GeForce FX or better" : ""; result += "; Available extensions:"; result += "\n Texturing: "; diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp index 58608c180..94f610687 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp @@ -157,8 +157,6 @@ void CDriverGL::enableLight (uint8 num, bool enable) { H_AUTO_OGL(CDriverGL_enableLight ) // User call => set the User flag - // Geforce FX tmp fix - if (_Extensions.IsGeforceFXOrAbove && num >=3) return; if(num<_MaxDriverLight) { _UserLightEnable[num]= enable;