From 441d3a66f5069e4fd823bc3f432129b273eefbd0 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 30 Mar 2014 15:00:50 +0200 Subject: [PATCH] GL3: Remove GL_EXT_separate_specular_color --HG-- branch : opengl3 --- code/nel/src/3d/driver/opengl3/driver_opengl.cpp | 5 ----- .../3d/driver/opengl3/driver_opengl_extension.cpp | 12 ------------ .../src/3d/driver/opengl3/driver_opengl_extension.h | 3 --- 3 files changed, 20 deletions(-) diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp index 0b9b4ab14..2820b4bb7 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp @@ -433,11 +433,6 @@ bool CDriverGL3::setupDisplay() // Default delta camera pos. _PZBCameraPos= CVector::Null; - // Be always in EXTSeparateSpecularColor. - if (_Extensions.EXTSeparateSpecularColor) - { - } - // Init VertexArrayRange according to supported extenstion. _SlowUnlockVBHard= false; 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 d6847cb07..6a6b8a5e1 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp @@ -519,15 +519,6 @@ static bool setupEXTTextureCompressionS3TC(const char *glext) return true; } - -// ********************************* -static bool setupEXTSeparateSpecularColor(const char *glext) -{ - H_AUTO_OGL(setupEXTSeparateSpecularColor); - CHECK_EXT("GL_EXT_separate_specular_color"); - return true; -} - // ********************************* static bool setupARBTextureCubeMap(const char *glext) { @@ -887,9 +878,6 @@ void registerGlExtensions(CGlExtensions &ext) // Check ARBMultisample ext.ARBMultisample = setupARBMultisample(glext); - // Check EXTSeparateSpecularColor. - ext.EXTSeparateSpecularColor= setupEXTSeparateSpecularColor(glext); - // Check for cube mapping ext.ARBTextureCubeMap = setupARBTextureCubeMap(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 15f851b8b..f67da18cd 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h @@ -49,7 +49,6 @@ struct CGlExtensions uint NbTextureStages; // Optional Extensions. (old) - bool EXTSeparateSpecularColor; bool ARBTextureCubeMap; bool NVTextureRectangle; bool EXTTextureRectangle; @@ -75,7 +74,6 @@ public: ARBMultiTexture= false; NbTextureStages= 1; EXTTextureCompressionS3TC= false; - EXTSeparateSpecularColor= false; ARBTextureCubeMap= false; EXTSecondaryColor= false; WGLARBPBuffer= false; @@ -111,7 +109,6 @@ public: result += NLMISC::toString(NbTextureStages); result += "\n Misc: "; - result += EXTSeparateSpecularColor ? "EXTSeparateSpecularColor " : ""; result += EXTSecondaryColor ? "EXTSecondaryColor " : ""; result += EXTBlendColor ? "EXTBlendColor " : ""; result += ARBMultisample ? "ARBMultisample " : "";