diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox index 51882e1e0..f643712ff 100644 --- a/doc/opengl-support.dox +++ b/doc/opengl-support.dox @@ -338,7 +338,7 @@ Extension | Status @es_extension{OES,required_internalformat} | done (desktop-compatible subset) @es_extension{OES,surfaceless_context} | done -@subsection opengl-support-es-extensions OpenGL ES extensions to match desktop functionality +@subsection opengl-support-es-extensions OpenGL ES extensions @todo @es_extension{NV,non_square_matrices} @todo Support also IMG_multisampled_render_to_texture? It has different enum @@ -348,6 +348,8 @@ Extension | Status ------------------------------------------- | ------ @es_extension{ANDROID,extension_pack_es31a} | done (nothing to do) @es_extension{APPLE,texture_format_BGRA8888} | done +@es_extension{ARM,shader_framebuffer_fetch} | | +@es_extension{ARM,shader_framebuffer_fetch_depth_stencil} | | @es_extension{CHROMIUM,map_sub} (NaCl only) | only buffer mapping @es_extension{EXT,texture_filter_anisotropic} | done @es_extension{EXT,texture_format_BGRA8888} | done @@ -358,6 +360,7 @@ Extension | Status @es_extension{EXT,separate_shader_objects} | only direct uniform binding @es_extension{EXT,multisampled_render_to_texture} | only renderbuffer storage @es_extension{EXT,robustness} | done +@es_extension{EXT,shader_framebuffer_fetch} | | @es_extension{EXT,disjoint_timer_query} | only time elapsed query @es_extension{EXT,texture_sRGB_decode} | done @es_extension{EXT,sRGB_write_control} | done diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index d1ccf9235..aa5cdd51c 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -251,6 +251,8 @@ const std::vector& Extension::extensions(Version version) { _extension(GL,ANDROID,extension_pack_es31a), #endif _extension(GL,APPLE,texture_format_BGRA8888), + _extension(GL,ARM,shader_framebuffer_fetch), + _extension(GL,ARM,shader_framebuffer_fetch_depth_stencil), #ifdef CORRADE_TARGET_NACL _extension(GL,CHROMIUM,map_sub), #endif @@ -260,6 +262,7 @@ const std::vector& Extension::extensions(Version version) { _extension(GL,EXT,multi_draw_arrays), _extension(GL,EXT,debug_label), _extension(GL,EXT,debug_marker), + _extension(GL,EXT,shader_framebuffer_fetch), _extension(GL,EXT,disjoint_timer_query), _extension(GL,EXT,texture_sRGB_decode), _extension(GL,EXT,sRGB_write_control), diff --git a/src/Magnum/Extensions.h b/src/Magnum/Extensions.h index a36c4f5d4..a9ef8042f 100644 --- a/src/Magnum/Extensions.h +++ b/src/Magnum/Extensions.h @@ -298,6 +298,8 @@ namespace GL { #ifdef MAGNUM_TARGET_GLES2 _extension(GL,ARM,rgba8, GLES200, GLES300) // #82 #endif + _extension(GL,ARM,shader_framebuffer_fetch, GLES200, None) // #165 + _extension(GL,ARM,shader_framebuffer_fetch_depth_stencil, GLES200, None) // #166 } namespace CHROMIUM { #ifdef CORRADE_TARGET_NACL _extension(GL,CHROMIUM,map_sub, GLES200, None) @@ -335,6 +337,7 @@ namespace GL { _extension(GL,EXT,texture_storage, GLES200, GLES300) // #108 _extension(GL,EXT,map_buffer_range, GLES200, GLES300) // #121 #endif + _extension(GL,EXT,shader_framebuffer_fetch, GLES200, None) // #122 _extension(GL,EXT,disjoint_timer_query, GLES200, None) // #150 #ifdef MAGNUM_TARGET_GLES2 _extension(GL,EXT,draw_buffers, GLES200, GLES300) // #151