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 88691b7c3..424a1ad36 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp @@ -890,15 +890,6 @@ static bool setupGLSL( const char *glext ) return true; } -static bool setupVA( const char *glext ) -{ - CHECK_ADDRESS(PFNGLENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); - CHECK_ADDRESS(PFNGLDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); - CHECK_ADDRESS(PFNGLVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); - - return true; -} - static bool setupSeparateShaderObjects( const char *glext ) { CHECK_EXT( "GL_ARB_separate_shader_objects" ); @@ -1086,8 +1077,6 @@ void registerGlExtensions(CGlExtensions &ext) setupARBVertexBufferObject(glext); - setupVA( glext ); - if( !setupGLSL( glext ) ) { nlinfo( "Failed to set up GLSL related calls!" ); diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp index 47695dfe9..2236049a0 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp @@ -657,13 +657,14 @@ void CDriverGLStates3::enableVertexAttribArrayARB(uint glIndex,bool enable) if(_VertexAttribArrayEnabled[glIndex] != enable) #endif { - if(enable) - nglEnableVertexAttribArrayARB(glIndex); + if( enable ) + nglEnableVertexAttribArray(glIndex); else - nglDisableVertexAttribArrayARB(glIndex); + nglDisableVertexAttribArray(glIndex); _VertexAttribArrayEnabled[glIndex]= enable; } + } // *************************************************************************** diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp index 2b2472fd8..56ee8fea6 100644 --- a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp +++ b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp @@ -404,7 +404,7 @@ void CDriverGL3::setupGlArrays(CVertexBufferInfo &vb) { mustNormalize = ARBVertexProgramMustNormalizeAttrib[value]; } - nglVertexAttribPointerARB(glIndex, NumCoordinatesType[type], GLType[type], mustNormalize, vb.VertexSize, vb.ValuePtr[value]); + nglVertexAttribPointer( glIndex, NumCoordinatesType[type], GLType[ type ], mustNormalize, vb.VertexSize, vb.ValuePtr[value] ); } else {