Merge branch 'master' into compatibility

modules/FindOpenGLES2.cmake

@@ -8,7 +8,9 @@
 #
 
 # Library
-find_library(OPENGLES2_LIBRARY GLESv2)
+find_library(OPENGLES2_LIBRARY NAMES
+    GLESv2
+    ppapi_gles2) # NaCl
 
 # Include dir
 find_path(OPENGLES2_INCLUDE_DIR

src/AbstractShaderProgram.h

@@ -36,6 +36,8 @@ namespace Math {
     template<std::size_t, class> class Vector;
 }
 
+template<class> class Color3;
+template<class> class Color4;
 class Context;
 class Shader;
 
@@ -1211,8 +1213,6 @@ template<class T> struct Attribute<Math::Vector4<T>>: public Attribute<Math::Vec
 template<class T> struct Attribute<Math::Point2D<T>>: public Attribute<Math::Vector3<T>> {};
 template<class T> struct Attribute<Math::Point3D<T>>: public Attribute<Math::Vector4<T>> {};
 
-template<class> class Color3;
-template<class> class Color4;
 template<class T> struct Attribute<Color3<T>>: public Attribute<Math::Vector3<T>> {};
 template<class T> struct Attribute<Color4<T>>: public Attribute<Math::Vector4<T>> {};
 

src/AbstractTexture.h

@@ -232,9 +232,11 @@ class MAGNUM_EXPORT AbstractTexture {
              * are converted to range @f$ [-1.0; 1.0] @f$.
              * @requires_gl31 Extension @extension{EXT,texture_snorm}
              */
-            NormalizedByte,
+            NormalizedByte
 
             #ifndef MAGNUM_TARGET_GLES
+            ,
+
             /**
              * Normalized unsigned short, i.e. values from range @f$ [0; 65536] @f$
              * are converted to range @f$ [0.0; 1.0] @f$.

src/Shaders/CMakeLists.txt

@@ -1,6 +1,6 @@
 corrade_add_resource(MagnumShaders_RCS MagnumShaders
     FlatShader2D.vert FlatShader2D.frag
-    PhongShader.frag PhongShader.vert
+    PhongShader.vert PhongShader.frag
     compatibility.glsl)
 set(MagnumShaders_SRCS
     FlatShader.cpp