diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp index affeac4fb..07653f73e 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp @@ -515,15 +515,6 @@ static bool setupARBMultiTexture(const char *glext) return true; } -// ********************************* -static bool setupEXTTextureEnvCombine(const char *glext) -{ - H_AUTO_OGL(setupEXTTextureEnvCombine); - - return (strstr(glext, "GL_EXT_texture_env_combine")!=NULL || strstr(glext, "GL_ARB_texture_env_combine")!=NULL); -} - - // ********************************* static bool setupARBTextureCompression(const char *glext) { @@ -1013,9 +1004,6 @@ void registerGlExtensions(CGlExtensions &ext) ext.NbTextureStages= (ntext<((GLint)IDRV_MAT_MAXTEXTURES)?ntext:IDRV_MAT_MAXTEXTURES); } - // Check EXTTextureEnvCombine - ext.EXTTextureEnvCombine= setupEXTTextureEnvCombine(glext); - // Check ARBTextureCompression ext.ARBTextureCompression= setupARBTextureCompression(glext); diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h index d04b26ab9..5f0008202 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h @@ -42,7 +42,6 @@ struct CGlExtensions bool ARBMultiTexture; uint NbTextureStages; - bool EXTTextureEnvCombine; // Optional Extensions. bool EXTTextureCompressionS3TC; @@ -90,7 +89,6 @@ public: // Fill all false by default. ARBMultiTexture= false; NbTextureStages= 1; - EXTTextureEnvCombine= false; ARBTextureCompression= false; EXTTextureCompressionS3TC= false; EXTVertexWeighting= false; @@ -129,7 +127,6 @@ public: result += "\n Texturing: "; result += ARBMultiTexture ? "ARBMultiTexture " : ""; - result += EXTTextureEnvCombine ? "EXTTextureEnvCombine(*) " : ""; result += ARBTextureCompression ? "ARBTextureCompression " : ""; result += EXTTextureCompressionS3TC ? "EXTTextureCompressionS3TC " : ""; result += ATITextureEnvCombine3 ? "ATITextureEnvCombine3 " : "";