diff --git a/doc/changelog.dox b/doc/changelog.dox index dfd8e58f8..81596ae4e 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -53,6 +53,12 @@ See also: @subsection changelog-latest-changes Changes and improvements +@subsubsection changelog-latest-changes-gl GL library + +- Added @ref GL::Framebuffer::Status::IncompleteDimensions for ES2. This enum + isn't available on ES3 or desktop GL, but NVidia drivers are known to emit + it, which is why it got added. + @subsubsection changelog-latest-changes-meshtools MeshTools library - Added a `--bounds` option to @ref magnum-sceneconverter "magnum-sceneconverter", diff --git a/src/Magnum/GL/Framebuffer.cpp b/src/Magnum/GL/Framebuffer.cpp index f85852579..36b02cfaa 100644 --- a/src/Magnum/GL/Framebuffer.cpp +++ b/src/Magnum/GL/Framebuffer.cpp @@ -405,6 +405,9 @@ Debug& operator<<(Debug& debug, const Framebuffer::Status value) { _c(Complete) _c(IncompleteAttachment) _c(IncompleteMissingAttachment) + #ifdef MAGNUM_TARGET_GLES2 + _c(IncompleteDimensions) + #endif #ifndef MAGNUM_TARGET_GLES _c(IncompleteDrawBuffer) _c(IncompleteReadBuffer) diff --git a/src/Magnum/GL/Framebuffer.h b/src/Magnum/GL/Framebuffer.h index 574fbe7ed..a3d10fc1a 100644 --- a/src/Magnum/GL/Framebuffer.h +++ b/src/Magnum/GL/Framebuffer.h @@ -280,6 +280,17 @@ class MAGNUM_GL_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractO /** The framebuffer does not have at least one image attached to it */ IncompleteMissingAttachment = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT, + #if defined(MAGNUM_TARGET_GLES2) || defined(DOXYGEN_GENERATING_OUTPUT) + /** + * The attached images have different sizes. + * @requires_gles20 This restriction is only present in OpenGL ES + * 2.0, not in desktop GL or OpenGL ES 3.0 anymore. Note that, + * however, NVidia desktop drivers are known to emit this + * value (@cpp 0x8CD9 @ce) in some cases. + */ + IncompleteDimensions = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS, + #endif + #ifndef MAGNUM_TARGET_GLES /** @todo Why exactly this is not needed? */ /**