diff --git a/src/Magnum/Platform/magnum-info.cpp b/src/Magnum/Platform/magnum-info.cpp index 17e8b3d04..1b33a05e3 100644 --- a/src/Magnum/Platform/magnum-info.cpp +++ b/src/Magnum/Platform/magnum-info.cpp @@ -379,25 +379,6 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat } #endif - #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) - #ifndef MAGNUM_TARGET_GLES - if(c->isExtensionSupported()) - #else - if(c->isExtensionSupported()) - #endif - { - #ifndef MAGNUM_TARGET_GLES - _h(ARB::geometry_shader4) - #else - _h(EXT::geometry_shader) - #endif - - _l(Shader::maxGeometryInputComponents()) - _l(Shader::maxGeometryOutputComponents()) - _l(Shader::maxGeometryTotalOutputComponents()) - } - #endif - #ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES if(c->isExtensionSupported()) @@ -467,76 +448,6 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat } #endif - #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) - #ifndef MAGNUM_TARGET_GLES - if(c->isExtensionSupported()) - #else - if(c->isExtensionSupported()) - #endif - { - #ifndef MAGNUM_TARGET_GLES - _h(ARB::tessellation_shader) - #else - _h(EXT::tessellation_shader) - #endif - - _l(Buffer::shaderStorageOffsetAlignment()) - _l(Buffer::maxShaderStorageBindings()) - _l(Shader::maxTessellationControlInputComponents()) - _l(Shader::maxTessellationControlOutputComponents()) - _l(Shader::maxTessellationControlTotalOutputComponents()) - _l(Shader::maxTessellationEvaluationInputComponents()) - _l(Shader::maxTessellationEvaluationOutputComponents()) - } - #endif - - #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) - #ifndef MAGNUM_TARGET_GLES - if(c->isExtensionSupported()) - #else - if(c->isExtensionSupported()) - #endif - { - #ifndef MAGNUM_TARGET_GLES - _h(ARB::texture_buffer_object) - #else - _h(EXT::texture_buffer) - #endif - - _l(BufferTexture::maxSize()) - } - - #ifndef MAGNUM_TARGET_GLES - if(c->isExtensionSupported()) - #else - if(c->isExtensionSupported()) - #endif - { - #ifndef MAGNUM_TARGET_GLES - _h(ARB::texture_buffer_range) - #else - /* Header added above */ - #endif - - _l(BufferTexture::offsetAlignment()) - } - - #ifndef MAGNUM_TARGET_GLES - if(c->isExtensionSupported()) - #else - if(c->isExtensionSupported()) - #endif - { - #ifndef MAGNUM_TARGET_GLES - _h(ARB::texture_cube_map_array) - #else - _h(EXT::texture_cube_map_array) - #endif - - _l(CubeMapTextureArray::maxSize()) - } - #endif - #ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES if(c->isExtensionSupported()) @@ -616,12 +527,6 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat } #endif - if(c->isExtensionSupported()) { - _h(EXT::texture_filter_anisotropic) - - _l(Sampler::maxMaxAnisotropy()) - } - #ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES if(c->isExtensionSupported()) @@ -645,6 +550,101 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat } #endif + #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) + #ifndef MAGNUM_TARGET_GLES + if(c->isExtensionSupported()) + #else + if(c->isExtensionSupported()) + #endif + { + #ifndef MAGNUM_TARGET_GLES + _h(ARB::geometry_shader4) + #else + _h(EXT::geometry_shader) + #endif + + _l(Shader::maxGeometryInputComponents()) + _l(Shader::maxGeometryOutputComponents()) + _l(Shader::maxGeometryTotalOutputComponents()) + } + #endif + + #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) + #ifndef MAGNUM_TARGET_GLES + if(c->isExtensionSupported()) + #else + if(c->isExtensionSupported()) + #endif + { + #ifndef MAGNUM_TARGET_GLES + _h(ARB::tessellation_shader) + #else + _h(EXT::tessellation_shader) + #endif + + _l(Buffer::shaderStorageOffsetAlignment()) + _l(Buffer::maxShaderStorageBindings()) + _l(Shader::maxTessellationControlInputComponents()) + _l(Shader::maxTessellationControlOutputComponents()) + _l(Shader::maxTessellationControlTotalOutputComponents()) + _l(Shader::maxTessellationEvaluationInputComponents()) + _l(Shader::maxTessellationEvaluationOutputComponents()) + } + #endif + + #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) + #ifndef MAGNUM_TARGET_GLES + if(c->isExtensionSupported()) + #else + if(c->isExtensionSupported()) + #endif + { + #ifndef MAGNUM_TARGET_GLES + _h(ARB::texture_buffer_object) + #else + _h(EXT::texture_buffer) + #endif + + _l(BufferTexture::maxSize()) + } + + #ifndef MAGNUM_TARGET_GLES + if(c->isExtensionSupported()) + #else + if(c->isExtensionSupported()) + #endif + { + #ifndef MAGNUM_TARGET_GLES + _h(ARB::texture_buffer_range) + #else + /* Header added above */ + #endif + + _l(BufferTexture::offsetAlignment()) + } + + #ifndef MAGNUM_TARGET_GLES + if(c->isExtensionSupported()) + #else + if(c->isExtensionSupported()) + #endif + { + #ifndef MAGNUM_TARGET_GLES + _h(ARB::texture_cube_map_array) + #else + _h(EXT::texture_cube_map_array) + #endif + + _l(CubeMapTextureArray::maxSize()) + } + #endif + + if(c->isExtensionSupported()) { + _h(EXT::texture_filter_anisotropic) + + _l(Sampler::maxMaxAnisotropy()) + } + if(c->isExtensionSupported()) { _h(KHR::debug)