Shaders: remove various redundant ifdefs.

src/Magnum/Shaders/LineGL.cpp

@@ -201,7 +201,7 @@ template<UnsignedInt dimensions> typename LineGL<dimensions>::CompileState LineG
     out.submitLink();
 
     return CompileState{std::move(out), std::move(vert), std::move(frag)
-        #if !defined(MAGNUM_TARGET_GLES) || (!defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL))
+        #if !defined(MAGNUM_TARGET_GLES) || !defined(MAGNUM_TARGET_WEBGL)
         , version
         #endif
     };
@@ -219,7 +219,7 @@ template<UnsignedInt dimensions> LineGL<dimensions>::LineGL(CompileState&& state
     #ifndef MAGNUM_TARGET_GLES
     const GL::Context& context = GL::Context::current();
     if(!context.isExtensionSupported<GL::Extensions::ARB::explicit_uniform_location>(state._version))
-    #elif !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
+    #elif !defined(MAGNUM_TARGET_WEBGL)
     if(state._version < GL::Version::GLES310)
     #endif
     {
@@ -242,7 +242,7 @@ template<UnsignedInt dimensions> LineGL<dimensions>::LineGL(CompileState&& state
 
     #ifndef MAGNUM_TARGET_GLES
     if(!context.isExtensionSupported<GL::Extensions::ARB::shading_language_420pack>(state._version))
-    #elif !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
+    #elif !defined(MAGNUM_TARGET_WEBGL)
     if(state._version < GL::Version::GLES310)
     #endif
     {

src/Magnum/Shaders/LineGL.h

@@ -1104,17 +1104,17 @@ template<UnsignedInt dimensions> class LineGL<dimensions>::CompileState: public
     explicit CompileState(NoCreateT): LineGL{NoCreate}, _vert{NoCreate}, _frag{NoCreate} {}
 
     explicit CompileState(LineGL<dimensions>&& shader, GL::Shader&& vert, GL::Shader&& frag
-        #if !defined(MAGNUM_TARGET_GLES) || (!defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL))
+        #if !defined(MAGNUM_TARGET_GLES) || !defined(MAGNUM_TARGET_WEBGL)
         , GL::Version version
         #endif
     ): LineGL<dimensions>{Utility::move(shader)}, _vert{Utility::move(vert)}, _frag{Utility::move(frag)}
-        #if !defined(MAGNUM_TARGET_GLES) || (!defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL))
+        #if !defined(MAGNUM_TARGET_GLES) || !defined(MAGNUM_TARGET_WEBGL)
         , _version{version}
         #endif
         {}
 
     Implementation::GLShaderWrapper _vert, _frag;
-    #if !defined(MAGNUM_TARGET_GLES) || (!defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL))
+    #if !defined(MAGNUM_TARGET_GLES) || !defined(MAGNUM_TARGET_WEBGL)
     GL::Version _version;
     #endif
 };

src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp

@@ -1399,14 +1399,9 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
     /* MSVC needs explicit type due to default template args */
     addTests<MeshVisualizerGLTest>({
         &MeshVisualizerGLTest::renderDefaultsWireframe2D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsWireframe2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
-        #endif
         &MeshVisualizerGLTest::renderDefaultsWireframe3D,
-        #ifndef MAGNUM_TARGET_GLES2
+        &MeshVisualizerGLTest::renderDefaultsWireframe3D<MeshVisualizerGL3D::Flag::UniformBuffers>},
-        &MeshVisualizerGLTest::renderDefaultsWireframe3D<MeshVisualizerGL3D::Flag::UniformBuffers>,
-        #endif
-        },
         &MeshVisualizerGLTest::renderSetup,
         &MeshVisualizerGLTest::renderTeardown);
     #endif
@@ -1415,14 +1410,9 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
     /* MSVC needs explicit type due to default template args */
     addTests<MeshVisualizerGLTest>({
         &MeshVisualizerGLTest::renderDefaultsObjectId2D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsObjectId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
-        #endif
         &MeshVisualizerGLTest::renderDefaultsObjectId3D,
-        #ifndef MAGNUM_TARGET_GLES2
+        &MeshVisualizerGLTest::renderDefaultsObjectId3D<MeshVisualizerGL3D::Flag::UniformBuffers>},
-        &MeshVisualizerGLTest::renderDefaultsObjectId3D<MeshVisualizerGL3D::Flag::UniformBuffers>,
-        #endif
-        },
         &MeshVisualizerGLTest::renderSetup,
         &MeshVisualizerGLTest::renderTeardown);
     #endif
@@ -1431,14 +1421,9 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
     /* MSVC needs explicit type due to default template args */
     addInstancedTests<MeshVisualizerGLTest>({
         &MeshVisualizerGLTest::renderDefaultsInstancedObjectId2D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsInstancedObjectId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
-        #endif
         &MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D,
-        #ifndef MAGNUM_TARGET_GLES2
+        &MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D<MeshVisualizerGL3D::Flag::UniformBuffers>},
-        &MeshVisualizerGLTest::renderDefaultsInstancedObjectId3D<MeshVisualizerGL3D::Flag::UniformBuffers>,
-        #endif
-        },
         Containers::arraySize(RenderInstancedObjectIdDefaultsData),
         &MeshVisualizerGLTest::renderSetup,
         &MeshVisualizerGLTest::renderTeardown);
@@ -1448,27 +1433,17 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
     /* MSVC needs explicit type due to default template args */
     addTests<MeshVisualizerGLTest>({
         &MeshVisualizerGLTest::renderDefaultsVertexId2D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsVertexId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
-        #endif
         &MeshVisualizerGLTest::renderDefaultsVertexId3D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsVertexId3D<MeshVisualizerGL3D::Flag::UniformBuffers>,
-        #endif
         &MeshVisualizerGLTest::renderDefaultsPrimitiveId2D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsPrimitiveId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
-        #endif
         &MeshVisualizerGLTest::renderDefaultsPrimitiveId3D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsPrimitiveId3D<MeshVisualizerGL3D::Flag::UniformBuffers>,
-        #endif
         #ifndef MAGNUM_TARGET_WEBGL
         &MeshVisualizerGLTest::renderDefaultsTangentBitangentNormal,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderDefaultsTangentBitangentNormal<MeshVisualizerGL3D::Flag::UniformBuffers>,
         #endif
-        #endif
         },
         &MeshVisualizerGLTest::renderSetup,
         &MeshVisualizerGLTest::renderTeardown);
@@ -1500,13 +1475,9 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
     /* MSVC needs explicit type due to default template args */
     addInstancedTests<MeshVisualizerGLTest>({
         &MeshVisualizerGLTest::renderObjectVertexPrimitiveId2D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderObjectVertexPrimitiveId2D<MeshVisualizerGL2D::Flag::UniformBuffers>,
-        #endif
         &MeshVisualizerGLTest::renderObjectVertexPrimitiveId3D,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderObjectVertexPrimitiveId3D<MeshVisualizerGL3D::Flag::UniformBuffers>,
-        #endif
         },
         Containers::arraySize(RenderObjectVertexPrimitiveIdData),
         &MeshVisualizerGLTest::renderSetup,
@@ -1521,9 +1492,7 @@ MeshVisualizerGLTest::MeshVisualizerGLTest() {
     /* MSVC needs explicit type due to default template args */
     addInstancedTests<MeshVisualizerGLTest>({
         &MeshVisualizerGLTest::renderTangentBitangentNormal,
-        #ifndef MAGNUM_TARGET_GLES2
         &MeshVisualizerGLTest::renderTangentBitangentNormal<MeshVisualizerGL3D::Flag::UniformBuffers>,
-        #endif
         },
         Containers::arraySize(RenderTangentBitangentNormalData),
         &MeshVisualizerGLTest::renderSetup,