From fce7aab22c7c5ad5a704c19573d5322ceb476797 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 30 Mar 2014 14:59:32 +0200 Subject: [PATCH] GL3: Remove GL_EXT_vertex_weighting --HG-- branch : opengl3 --- .../opengl3/driver_opengl_extension.cpp | 21 ------------------- .../driver/opengl3/driver_opengl_extension.h | 10 --------- 2 files changed, 31 deletions(-) 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 589f559e7..d6847cb07 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp @@ -101,11 +101,6 @@ NEL_PFNGLMULTITEXCOORD4IVARBPROC nglMultiTexCoord4ivARB; NEL_PFNGLMULTITEXCOORD4FVARBPROC nglMultiTexCoord4fvARB; NEL_PFNGLMULTITEXCOORD4DVARBPROC nglMultiTexCoord4dvARB; -// VertexWeighting. -NEL_PFNGLVERTEXWEIGHTFEXTPROC nglVertexWeightfEXT; -NEL_PFNGLVERTEXWEIGHTFVEXTPROC nglVertexWeightfvEXT; -NEL_PFNGLVERTEXWEIGHTPOINTEREXTPROC nglVertexWeightPointerEXT; - // SecondaryColor extension NEL_PFNGLSECONDARYCOLOR3BEXTPROC nglSecondaryColor3bEXT; NEL_PFNGLSECONDARYCOLOR3BVEXTPROC nglSecondaryColor3bvEXT; @@ -524,19 +519,6 @@ static bool setupEXTTextureCompressionS3TC(const char *glext) return true; } -// ********************************* -static bool setupEXTVertexWeighting(const char *glext) -{ - H_AUTO_OGL(setupEXTVertexWeighting); - CHECK_EXT("GL_EXT_vertex_weighting"); - - CHECK_ADDRESS(NEL_PFNGLVERTEXWEIGHTFEXTPROC, glVertexWeightfEXT); - CHECK_ADDRESS(NEL_PFNGLVERTEXWEIGHTFVEXTPROC, glVertexWeightfvEXT); - CHECK_ADDRESS(NEL_PFNGLVERTEXWEIGHTPOINTEREXTPROC, glVertexWeightPointerEXT); - - return true; -} - // ********************************* static bool setupEXTSeparateSpecularColor(const char *glext) @@ -905,9 +887,6 @@ void registerGlExtensions(CGlExtensions &ext) // Check ARBMultisample ext.ARBMultisample = setupARBMultisample(glext); - // Check if NVidia GL_EXT_vertex_weighting is available. - ext.EXTVertexWeighting= setupEXTVertexWeighting(glext); - // Check EXTSeparateSpecularColor. ext.EXTSeparateSpecularColor= setupEXTSeparateSpecularColor(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 8bbc8b49c..15f851b8b 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 EXTVertexWeighting; bool EXTSeparateSpecularColor; bool ARBTextureCubeMap; bool NVTextureRectangle; @@ -76,7 +75,6 @@ public: ARBMultiTexture= false; NbTextureStages= 1; EXTTextureCompressionS3TC= false; - EXTVertexWeighting= false; EXTSeparateSpecularColor= false; ARBTextureCubeMap= false; EXTSecondaryColor= false; @@ -113,7 +111,6 @@ public: result += NLMISC::toString(NbTextureStages); result += "\n Misc: "; - result += EXTVertexWeighting ? "EXTVertexWeighting " : ""; result += EXTSeparateSpecularColor ? "EXTSeparateSpecularColor " : ""; result += EXTSecondaryColor ? "EXTSecondaryColor " : ""; result += EXTBlendColor ? "EXTBlendColor " : ""; @@ -207,13 +204,6 @@ extern NEL_PFNGLMULTITEXCOORD4FVARBPROC nglMultiTexCoord4fvARB; extern NEL_PFNGLMULTITEXCOORD4DVARBPROC nglMultiTexCoord4dvARB; -// VertexWeighting. -//================== -extern NEL_PFNGLVERTEXWEIGHTFEXTPROC nglVertexWeightfEXT; -extern NEL_PFNGLVERTEXWEIGHTFVEXTPROC nglVertexWeightfvEXT; -extern NEL_PFNGLVERTEXWEIGHTPOINTEREXTPROC nglVertexWeightPointerEXT; - - // ATI_envmap_bumpmap extension extern PFNGLTEXBUMPPARAMETERIVATIPROC nglTexBumpParameterivATI;