diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h index 0be1f2e34..5dd8b6d11 100644 --- a/src/AbstractFramebuffer.h +++ b/src/AbstractFramebuffer.h @@ -82,7 +82,8 @@ class MAGNUM_EXPORT AbstractFramebuffer { * * @see BlitMask * @requires_gl30 %Extension @extension{EXT,framebuffer_object} - * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} + * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} or + * @es_extension{NV,framebuffer_blit} */ enum class Blit: GLbitfield { ColorBuffer = GL_COLOR_BUFFER_BIT, /**< Color buffer */ @@ -95,7 +96,8 @@ class MAGNUM_EXPORT AbstractFramebuffer { * * @see blit() * @requires_gl30 %Extension @extension{EXT,framebuffer_object} - * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} + * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} or + * @es_extension{NV,framebuffer_blit} */ typedef Corrade::Containers::EnumSet BlitMask; @@ -120,8 +122,8 @@ class MAGNUM_EXPORT AbstractFramebuffer { /** * For reading only. * @requires_gl30 %Extension @extension{EXT,framebuffer_blit} - * @requires_gles30 %Extension @es_extension{APPLE,framebuffer_multisample} - * or @es_extension{ANGLE,framebuffer_blit} + * @requires_gles30 %Extension @es_extension{APPLE,framebuffer_multisample}, + * @es_extension{ANGLE,framebuffer_blit} or @es_extension{NV,framebuffer_blit} */ #ifndef MAGNUM_TARGET_GLES2 Read = GL_READ_FRAMEBUFFER, @@ -132,8 +134,8 @@ class MAGNUM_EXPORT AbstractFramebuffer { /** * For drawing only. * @requires_gl30 %Extension @extension{EXT,framebuffer_blit} - * @requires_gles30 %Extension @es_extension{APPLE,framebuffer_multisample} - * or @es_extension{ANGLE,framebuffer_blit} + * @requires_gles30 %Extension @es_extension{APPLE,framebuffer_multisample}, + * @es_extension{ANGLE,framebuffer_blit} or @es_extension{NV,framebuffer_blit} */ #ifndef MAGNUM_TARGET_GLES2 Draw = GL_DRAW_FRAMEBUFFER, @@ -161,7 +163,8 @@ class MAGNUM_EXPORT AbstractFramebuffer { * blitting operation. * @see @fn_gl{BlitFramebuffer} * @requires_gl30 %Extension @extension{EXT,framebuffer_blit} - * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} + * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} or + * @es_extension{NV,framebuffer_blit} */ static void blit(AbstractFramebuffer& source, AbstractFramebuffer& destination, const Rectanglei& sourceRectangle, const Rectanglei& destinationRectangle, BlitMask mask, BlitFilter filter); @@ -178,7 +181,8 @@ class MAGNUM_EXPORT AbstractFramebuffer { * @ref BlitFilter "BlitFilter::Nearest" filtering is used by default. * @see @fn_gl{BlitFramebuffer} * @requires_gl30 %Extension @extension{EXT,framebuffer_blit} - * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} + * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} or + * @es_extension{NV,framebuffer_blit} */ inline static void blit(AbstractFramebuffer& source, AbstractFramebuffer& destination, const Rectanglei& rectangle, BlitMask mask) { blit(source, destination, rectangle, rectangle, mask, BlitFilter::Nearest); diff --git a/src/Context.cpp b/src/Context.cpp index b30f2b251..9d511f0e1 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -232,6 +232,7 @@ const std::vector& Extension::extensions(Version version) { _extension(GL,NV,read_buffer), _extension(GL,NV,read_depth), _extension(GL,NV,read_depth_stencil), + _extension(GL,NV,framebuffer_blit), // done _extension(GL,OES,depth24), _extension(GL,OES,element_index_uint), _extension(GL,OES,rgb8_rgba8), diff --git a/src/Extensions.h b/src/Extensions.h index aa570bef3..476f18101 100644 --- a/src/Extensions.h +++ b/src/Extensions.h @@ -209,6 +209,7 @@ namespace GL { _extension(GL,NV,read_depth, GLES200, GLES300) // #94 _extension(GL,NV,read_stencil, GLES200, None) // #94 _extension(GL,NV,read_depth_stencil, GLES200, GLES300) // #94 + _extension(GL,NV,framebuffer_blit, GLES200, GLES300) // #142 } namespace OES { _extension(GL,OES,depth24, GLES200, GLES300) // #24 _extension(GL,OES,depth32, GLES200, None) // #25