diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox index c7c997107..2e90d25e8 100644 --- a/doc/opengl-support.dox +++ b/doc/opengl-support.dox @@ -348,8 +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{ARM,shader_framebuffer_fetch} | missing renderer setup and limit query +@es_extension{ARM,shader_framebuffer_fetch_depth_stencil} | done (shading language only) @es_extension{CHROMIUM,map_sub} (NaCl only) | only buffer mapping @es_extension{EXT,texture_filter_anisotropic} | done @es_extension{EXT,texture_format_BGRA8888} | done @@ -360,7 +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,shader_framebuffer_fetch} | missing limit query @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/MagnumExternal/OpenGL/GLES2/extensions.txt b/src/MagnumExternal/OpenGL/GLES2/extensions.txt index c3b32ba19..9abbd3b66 100644 --- a/src/MagnumExternal/OpenGL/GLES2/extensions.txt +++ b/src/MagnumExternal/OpenGL/GLES2/extensions.txt @@ -51,12 +51,15 @@ extension OES_required_internalformat optional extension OES_surfaceless_context optional extension APPLE_texture_format_BGRA8888 optional +extension ARM_shader_framebuffer_fetch optional +extension ARM_shader_framebuffer_fetch_depth_stencil optional extension EXT_texture_filter_anisotropic optional extension EXT_texture_format_BGRA8888 optional extension EXT_read_format_bgra optional extension EXT_multi_draw_arrays optional extension EXT_debug_label optional extension EXT_debug_marker optional +extension EXT_shader_framebuffer_fetch optional extension EXT_disjoint_timer_query optional extension EXT_texture_sRGB_decode optional extension EXT_sRGB_write_control optional diff --git a/src/MagnumExternal/OpenGL/GLES2/flextGL.h b/src/MagnumExternal/OpenGL/GLES2/flextGL.h index 9c0a50d28..606c85332 100644 --- a/src/MagnumExternal/OpenGL/GLES2/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES2/flextGL.h @@ -720,6 +720,11 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_BGRA_EXT 0x80E1 #define GL_BGRA8_EXT 0x93A1 +/* GL_ARM_shader_framebuffer_fetch */ + +#define GL_FETCH_PER_SAMPLE_ARM 0x8F65 +#define GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM 0x8F66 + /* GL_EXT_texture_filter_anisotropic */ #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE @@ -746,6 +751,10 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_SAMPLER 0x82E6 #define GL_TRANSFORM_FEEDBACK 0x8E22 +/* GL_EXT_shader_framebuffer_fetch */ + +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 + /* GL_EXT_disjoint_timer_query */ #define GL_QUERY_COUNTER_BITS_EXT 0x8864 diff --git a/src/MagnumExternal/OpenGL/GLES3/extensions.txt b/src/MagnumExternal/OpenGL/GLES3/extensions.txt index 5e7d2760a..8b56b0b6a 100644 --- a/src/MagnumExternal/OpenGL/GLES3/extensions.txt +++ b/src/MagnumExternal/OpenGL/GLES3/extensions.txt @@ -4,12 +4,15 @@ version 3.1 es extension ANDROID_extension_pack_es31a optional extension APPLE_texture_format_BGRA8888 optional +extension ARM_shader_framebuffer_fetch optional +extension ARM_shader_framebuffer_fetch_depth_stencil optional extension EXT_texture_filter_anisotropic optional extension EXT_texture_format_BGRA8888 optional extension EXT_read_format_bgra optional extension EXT_multi_draw_arrays optional extension EXT_debug_label optional extension EXT_debug_marker optional +extension EXT_shader_framebuffer_fetch optional extension EXT_disjoint_timer_query optional extension EXT_texture_sRGB_decode optional extension EXT_sRGB_write_control optional diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index 1286c46dc..865dfd90c 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -900,6 +900,11 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_BGRA_EXT 0x80E1 #define GL_BGRA8_EXT 0x93A1 +/* GL_ARM_shader_framebuffer_fetch */ + +#define GL_FETCH_PER_SAMPLE_ARM 0x8F65 +#define GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM 0x8F66 + /* GL_EXT_texture_filter_anisotropic */ #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE @@ -926,6 +931,10 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_SAMPLER 0x82E6 #define GL_TRANSFORM_FEEDBACK 0x8E22 +/* GL_EXT_shader_framebuffer_fetch */ + +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 + /* GL_EXT_disjoint_timer_query */ #define GL_QUERY_COUNTER_BITS_EXT 0x8864