diff --git a/src/Magnum/GL/AbstractTexture.cpp b/src/Magnum/GL/AbstractTexture.cpp index 24fc8f128..29cdd3dd9 100644 --- a/src/Magnum/GL/AbstractTexture.cpp +++ b/src/Magnum/GL/AbstractTexture.cpp @@ -1280,13 +1280,7 @@ void AbstractTexture::parameterIImplementationDSA(const GLenum parameter, const void AbstractTexture::setMaxAnisotropyImplementationNoOp(GLfloat) {} -#ifndef MAGNUM_TARGET_GLES -void AbstractTexture::setMaxAnisotropyImplementationArb(GLfloat anisotropy) { - (this->*Context::current().state().texture->parameterfImplementation)(GL_TEXTURE_MAX_ANISOTROPY, anisotropy); -} -#endif - -void AbstractTexture::setMaxAnisotropyImplementationExt(GLfloat anisotropy) { +void AbstractTexture::setMaxAnisotropyImplementationArbOrExt(GLfloat anisotropy) { (this->*Context::current().state().texture->parameterfImplementation)( #ifndef MAGNUM_TARGET_GLES GL_TEXTURE_MAX_ANISOTROPY diff --git a/src/Magnum/GL/AbstractTexture.h b/src/Magnum/GL/AbstractTexture.h index bface20b9..87027a8f2 100644 --- a/src/Magnum/GL/AbstractTexture.h +++ b/src/Magnum/GL/AbstractTexture.h @@ -586,10 +586,7 @@ class MAGNUM_GL_EXPORT AbstractTexture: public AbstractObject { #endif void MAGNUM_GL_LOCAL setMaxAnisotropyImplementationNoOp(GLfloat); - #ifndef MAGNUM_TARGET_GLES - void MAGNUM_GL_LOCAL setMaxAnisotropyImplementationArb(GLfloat anisotropy); - #endif - void MAGNUM_GL_LOCAL setMaxAnisotropyImplementationExt(GLfloat anisotropy); + void MAGNUM_GL_LOCAL setMaxAnisotropyImplementationArbOrExt(GLfloat anisotropy); #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) void MAGNUM_GL_LOCAL getLevelParameterImplementationDefault(GLint level, GLenum parameter, GLint* values); diff --git a/src/Magnum/GL/Implementation/TextureState.cpp b/src/Magnum/GL/Implementation/TextureState.cpp index 9e6e08659..0717b679e 100644 --- a/src/Magnum/GL/Implementation/TextureState.cpp +++ b/src/Magnum/GL/Implementation/TextureState.cpp @@ -432,14 +432,14 @@ TextureState::TextureState(Context& context, Containers::StaticArrayView()) { extensions[Extensions::EXT::texture_filter_anisotropic::Index] = Extensions::EXT::texture_filter_anisotropic::string(); - setMaxAnisotropyImplementation = &AbstractTexture::setMaxAnisotropyImplementationExt; + setMaxAnisotropyImplementation = &AbstractTexture::setMaxAnisotropyImplementationArbOrExt; } else setMaxAnisotropyImplementation = &AbstractTexture::setMaxAnisotropyImplementationNoOp; #ifndef MAGNUM_TARGET_GLES