diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox index f103f292b..7780c5b66 100644 --- a/doc/opengl-support.dox +++ b/doc/opengl-support.dox @@ -222,6 +222,7 @@ following: @extension{EXT,texture_filter_anisotropic} (also in ES) | done @extension{EXT,texture_mirror_clamp} | only GL 4.4 subset @extension{EXT,direct_state_access} | done for implemented functionality +@extension{EXT,shader_integer_mix} (also in ES) | done (shading language only) @extension2{EXT,debug_label} (also in ES) | missing pipeline, transform feedback and sampler label @extension2{EXT,debug_marker} (also in ES) | missing marker groups @extension{GREMEDY,string_marker} | done diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index 7055aa9c3..66b4d90fe 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -61,6 +61,7 @@ const std::vector& Extension::extensions(Version version) { _extension(GL,EXT,texture_filter_anisotropic), _extension(GL,EXT,texture_mirror_clamp), _extension(GL,EXT,direct_state_access), + _extension(GL,EXT,shader_integer_mix), _extension(GL,EXT,debug_label), _extension(GL,EXT,debug_marker), _extension(GL,GREMEDY,string_marker)}; diff --git a/src/Magnum/Extensions.h b/src/Magnum/Extensions.h index d9271cffc..841d5710c 100644 --- a/src/Magnum/Extensions.h +++ b/src/Magnum/Extensions.h @@ -182,6 +182,7 @@ namespace GL { _extension(GL,EXT,transform_feedback, GL210, GL300) // #352 _extension(GL,EXT,direct_state_access, GL210, None) // #353 _extension(GL,EXT,texture_snorm, GL300, GL310) // #365 + _extension(GL,EXT,shader_integer_mix, GL300, None) // #437 _extension(GL,EXT,debug_label, GL210, None) // #439 _extension(GL,EXT,debug_marker, GL210, None) // #440 } namespace GREMEDY { @@ -245,6 +246,9 @@ namespace GL { _extension(GL,EXT,map_buffer_range, GLES200, GLES300) // #121 #endif _extension(GL,EXT,disjoint_timer_query, GLES200, None) // #150 + #ifndef MAGNUM_TARGET_GLES2 + _extension(GL,EXT,shader_integer_mix, GLES300, None) // #161 + #endif } namespace KHR { _extension(GL,KHR,debug, GLES200, None) // #118 } namespace NV {