diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp index 34a30861f..7492a4028 100644 --- a/src/Magnum/AbstractTexture.cpp +++ b/src/Magnum/AbstractTexture.cpp @@ -757,21 +757,21 @@ void AbstractTexture::parameterImplementationDSA(GLenum parameter, const GLfloat #endif #ifndef MAGNUM_TARGET_GLES -void AbstractTexture::parameterImplementationDefault(GLenum parameter, const GLuint* values) { +void AbstractTexture::parameterIImplementationDefault(GLenum parameter, const GLuint* values) { bindInternal(); glTexParameterIuiv(_target, parameter, values); } -void AbstractTexture::parameterImplementationDSA(GLenum parameter, const GLuint* values) { +void AbstractTexture::parameterIImplementationDSA(GLenum parameter, const GLuint* values) { glTextureParameterIuivEXT(_id, _target, parameter, values); } -void AbstractTexture::parameterImplementationDefault(GLenum parameter, const GLint* values) { +void AbstractTexture::parameterIImplementationDefault(GLenum parameter, const GLint* values) { bindInternal(); glTexParameterIiv(_target, parameter, values); } -void AbstractTexture::parameterImplementationDSA(GLenum parameter, const GLint* values) { +void AbstractTexture::parameterIImplementationDSA(GLenum parameter, const GLint* values) { glTextureParameterIivEXT(_id, _target, parameter, values); } #endif diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index 7420cf450..78f51ab76 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -334,15 +334,15 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { void MAGNUM_LOCAL parameterImplementationDefault(GLenum parameter, GLfloat value); void MAGNUM_LOCAL parameterImplementationDefault(GLenum parameter, const GLfloat* values); #ifndef MAGNUM_TARGET_GLES - void MAGNUM_LOCAL parameterImplementationDefault(GLenum parameter, const GLuint* values); - void MAGNUM_LOCAL parameterImplementationDefault(GLenum parameter, const GLint* values); + void MAGNUM_LOCAL parameterIImplementationDefault(GLenum parameter, const GLuint* values); + void MAGNUM_LOCAL parameterIImplementationDefault(GLenum parameter, const GLint* values); #endif #ifndef MAGNUM_TARGET_GLES void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, GLint value); void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, GLfloat value); void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, const GLfloat* values); - void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, const GLuint* values); - void MAGNUM_LOCAL parameterImplementationDSA(GLenum parameter, const GLint* values); + void MAGNUM_LOCAL parameterIImplementationDSA(GLenum parameter, const GLuint* values); + void MAGNUM_LOCAL parameterIImplementationDSA(GLenum parameter, const GLint* values); #endif void MAGNUM_LOCAL setMaxAnisotropyImplementationNoOp(GLfloat); diff --git a/src/Magnum/Implementation/TextureState.cpp b/src/Magnum/Implementation/TextureState.cpp index 1463be29d..b08899058 100644 --- a/src/Magnum/Implementation/TextureState.cpp +++ b/src/Magnum/Implementation/TextureState.cpp @@ -73,8 +73,8 @@ TextureState::TextureState(Context& context, std::vector& extension parameteriImplementation = &AbstractTexture::parameterImplementationDSA; parameterfImplementation = &AbstractTexture::parameterImplementationDSA; parameterfvImplementation = &AbstractTexture::parameterImplementationDSA; - parameterIuivImplementation = &AbstractTexture::parameterImplementationDSA; - parameterIivImplementation = &AbstractTexture::parameterImplementationDSA; + parameterIuivImplementation = &AbstractTexture::parameterIImplementationDSA; + parameterIivImplementation = &AbstractTexture::parameterIImplementationDSA; getLevelParameterivImplementation = &AbstractTexture::getLevelParameterImplementationDSA; mipmapImplementation = &AbstractTexture::mipmapImplementationDSA; getImageImplementation = &AbstractTexture::getImageImplementationDSA; @@ -94,8 +94,8 @@ TextureState::TextureState(Context& context, std::vector& extension parameterfImplementation = &AbstractTexture::parameterImplementationDefault; parameterfvImplementation = &AbstractTexture::parameterImplementationDefault; #ifndef MAGNUM_TARGET_GLES - parameterIuivImplementation = &AbstractTexture::parameterImplementationDefault; - parameterIivImplementation = &AbstractTexture::parameterImplementationDefault; + parameterIuivImplementation = &AbstractTexture::parameterIImplementationDefault; + parameterIivImplementation = &AbstractTexture::parameterIImplementationDefault; getLevelParameterivImplementation = &AbstractTexture::getLevelParameterImplementationDefault; #endif mipmapImplementation = &AbstractTexture::mipmapImplementationDefault;