diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp index 681a62e91..5a0c320d5 100644 --- a/src/AbstractImage.cpp +++ b/src/AbstractImage.cpp @@ -103,7 +103,7 @@ std::size_t AbstractImage::pixelSize(Format format, Type type) { case Format::RGBAInteger: #endif case Format::BGRA: - #ifndef MAGNUM_TARGET_GLES2 + #ifndef MAGNUM_TARGET_GLES case Format::BGRAInteger: #endif return 4*size; diff --git a/src/AbstractImage.h b/src/AbstractImage.h index 34a21b9cc..44b828b5c 100644 --- a/src/AbstractImage.h +++ b/src/AbstractImage.h @@ -130,21 +130,25 @@ class MAGNUM_EXPORT AbstractImage { */ RedInteger = GL_RED_INTEGER, + #ifndef MAGNUM_TARGET_GLES /** * Integer green channel. * @requires_gl30 %Extension @extension{EXT,texture_integer} - * @requires_gles30 Only floating-point image data are available - * in OpenGL ES 2.0. + * @requires_gl Only @ref Format "Format::RedInteger" is available + * in OpenGL ES 3.0, only floating-point image data are + * available in OpenGL ES 2.0. */ GreenInteger = GL_GREEN_INTEGER, /** * Integer blue channel. * @requires_gl30 %Extension @extension{EXT,texture_integer} - * @requires_gles30 Only floating-point image data are available - * in OpenGL ES 2.0. + * @requires_gl Only @ref Format "Format::RedInteger" is available + * in OpenGL ES 3.0, only floating-point image data are + * available in OpenGL ES 2.0. */ BlueInteger = GL_BLUE_INTEGER, + #endif /** * Integer red and green channel. @@ -171,22 +175,26 @@ class MAGNUM_EXPORT AbstractImage { */ RGBAInteger = GL_RGBA_INTEGER, + #ifndef MAGNUM_TARGET_GLES /** * Integer BGR. * @requires_gl30 %Extension @extension{EXT,texture_integer} - * @requires_gles30 Only floating-point image data are available - * in OpenGL ES 2.0. + * @requires_gl Only @ref Format "Format::RGBInteger" is available + * in OpenGL ES 3.0, only floating-point image data are + * available in OpenGL ES 2.0. */ BGRInteger = GL_BGR_INTEGER, /** * Integer BGRA. * @requires_gl30 %Extension @extension{EXT,texture_integer} - * @requires_gles30 Only floating-point image data are available - * in OpenGL ES 2.0. + * @requires_gl Only @ref Format "Format::RGBAInteger" is + * available in OpenGL ES 3.0, only floating-point image data + * are available in OpenGL ES 2.0. */ BGRAInteger = GL_BGRA_INTEGER, #endif + #endif /** * Depth component. For framebuffer reading only.