From 5e648b2701e3fbc511b1674838bcca0ea35715cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 9 Nov 2012 22:30:04 +0100
Subject: [PATCH 1/4] Fixed Color3/Color4 support in shader attributes.

---
 src/AbstractShaderProgram.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h
index 1ed8222bc..0977ab649 100644
--- a/src/AbstractShaderProgram.h
+++ b/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>> {};
 

From 67dbdd4b00aa11ac3aa1892a9adb82a34d72857b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 9 Nov 2012 22:30:34 +0100
Subject: [PATCH 2/4] Fixed compiler warning when compiling with OpenGL ES
 support.

---
 src/AbstractTexture.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h
index 27b1895eb..35abf4823 100644
--- a/src/AbstractTexture.h
+++ b/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$.

From 7c7163e17b0c57513dadd4ae6c79361213387fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 9 Nov 2012 23:56:50 +0100
Subject: [PATCH 3/4] FindOpenGLES2.cmake: added library name for NaCl.

---
 modules/FindOpenGLES2.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/FindOpenGLES2.cmake b/modules/FindOpenGLES2.cmake
index c534bfd81..414db8368 100644
--- a/modules/FindOpenGLES2.cmake
+++ b/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

From dfccdf9b7ed46ef8bc3d0075f228c9f3e24a0aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 9 Nov 2012 23:57:46 +0100
Subject: [PATCH 4/4] Minor pedantic ordering fix.

---
 src/Shaders/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt
index 926bc6238..38a3ce0ad 100644
--- a/src/Shaders/CMakeLists.txt
+++ b/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