Merge branch 'master' into compatibility

Conflicts:
	doc/building.dox
	src/Magnum/DebugTools/ForceRenderer.h
	src/Magnum/Math/Angle.h

doc/building.dox

@@ -494,7 +494,7 @@ or `update-job`).
 
 Build is done using **Ninja** build system and everything possible is enabled,
 thus you need also **SDL2**, **GLUT** and **OpenAL** libraries. It expects that
-**GCC** >=4.8.2, 4.7, 4.6, 4.5, 4.4 and **Clang** are installed and there are
+**GCC** >= 4.8.1, 4.7, 4.6, 4.5, 4.4 and **Clang** are installed and there are
 **OpenGL**, **OpenGL ES 2.0** and **OpenGL ES 3.0** librares as it tries to
 compile the library with every combination of them. You can add/remove the axes
 in `axes/hudson.matrix.TextAxis` or via the web interface later.

src/Magnum/AbstractShaderProgram.h

@@ -311,10 +311,11 @@ also @ref Attribute::DataType enum for additional type options.
 %Shader limits (such as @ref maxVertexAttributes()) are cached, so repeated
 queries don't result in repeated @fn_gl{Get} calls.
 
-If extension @extension{ARB,separate_shader_objects} (part of OpenGL 4.1) or
-@extension{EXT,direct_state_access} is available, uniform setting functions
-use DSA functions to avoid unnecessary calls to @fn_gl{UseProgram}. See
-@ref setUniform() documentation for more information.
+If extension @extension{ARB,separate_shader_objects} (part of OpenGL 4.1),
+@extension{EXT,direct_state_access} or @es_extension{EXT,separate_shader_objects}
+on OpenGL ES is available, uniform setting functions use DSA functions to avoid
+unnecessary calls to @fn_gl{UseProgram}. See @ref setUniform() documentation
+for more information.
 
 To achieve least state changes, set all uniforms in one run -- method chaining
 comes in handy.
@@ -726,8 +727,9 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
          * @param values        Values
          *
          * If neither @extension{ARB,separate_shader_objects} (part of OpenGL
-         * 4.1) nor @extension{EXT,direct_state_access} is available, the
-         * shader is marked for use before the operation.
+         * 4.1) nor @extension{EXT,direct_state_access} nor
+         * @es_extension{EXT,separate_shader_objects} (on OpenGL ES) is
+         * available, the shader is marked for use before the operation.
          * @see @ref setUniform(Int, const T&), @fn_gl{UseProgram}, @fn_gl{Uniform}
          *      or @fn_gl{ProgramUniform}/@fn_gl_extension{ProgramUniform,EXT,direct_state_access}.
          */

src/Magnum/DebugTools/ForceRenderer.h

@@ -119,7 +119,10 @@ template<UnsignedInt dimensions> class MAGNUM_DEBUGTOOLS_EXPORT ForceRenderer: p
          */
         explicit ForceRenderer(SceneGraph::AbstractObject<dimensions, Float>& object, const typename DimensionTraits<dimensions, Float>::VectorType& forcePosition, const typename DimensionTraits<dimensions, Float>::VectorType& force, ResourceKey options = ResourceKey(), SceneGraph::DrawableGroup<dimensions, Float>* drawables = nullptr);
 
-        /** @overload */
+        /**
+         * You have to pass reference to existing force instance, as the
+         * renderer uses the current value when rendering.
+         */
         ForceRenderer(SceneGraph::AbstractObject<dimensions, Float>&, const typename DimensionTraits<dimensions, Float>::VectorType&, typename DimensionTraits<dimensions, Float>::VectorType&&, ResourceKey = ResourceKey(), SceneGraph::DrawableGroup<dimensions, Float>* = nullptr) = delete;
 
     private:

src/Magnum/Math/Angle.h

@@ -174,7 +174,6 @@ Float tangent = Math::tan(1.047_radf); // tangent = 1.732f
 @endcode
 @see Magnum::operator""_degf(), operator""_deg(), operator""_radf()
 @note Not available on GCC < 4.7 and MSVC 2013. Use @ref Deg::Deg(T) instead.
-@requires_gl Only single-precision types are available in OpenGL ES.
 @todoc Make references explicit when Doxygen can link to operator""
 */
 constexpr Deg<Float> operator "" _degf(long double value) { return Deg<Float>(value); }
@@ -219,6 +218,7 @@ template<class T> class Rad: public Unit<Rad, T> {
 See operator""_rad() for more information.
 @see Magnum::operator""_rad(), operator""_radf(), operator""_deg()
 @note Not available on GCC < 4.7 and MSVC 2013. Use @ref Rad::Rad(T) instead.
+@requires_gl Only single-precision types are available in OpenGL ES.
 @todoc Make references explicit when Doxygen can link to operator""
 */
 constexpr Rad<Double> operator "" _rad(long double value) { return Rad<Double>(value); }

src/Magnum/Shader.h

@@ -366,11 +366,11 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
          * `0`.
          * @see @ref maxCombinedTextureImageUnits(),
          *      @fn_gl{Get} with @def_gl{MAX_VERTEX_TEXTURE_IMAGE_UNITS},
-         *      @fn_gl{MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS},
-         *      @fn_gl{MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS},
-         *      @fn_gl{MAX_GEOMETRY_TEXTURE_IMAGE_UNITS},
-         *      @fn_gl{MAX_COMPUTE_TEXTURE_IMAGE_UNITS},
-         *      @fn_gl{MAX_TEXTURE_IMAGE_UNITS}
+         *      @def_gl{MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS},
+         *      @def_gl{MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS},
+         *      @def_gl{MAX_GEOMETRY_TEXTURE_IMAGE_UNITS},
+         *      @def_gl{MAX_COMPUTE_TEXTURE_IMAGE_UNITS},
+         *      @def_gl{MAX_TEXTURE_IMAGE_UNITS}
          */
         static Int maxTextureImageUnits(Type type);