From 40a69636bda900c65aebb069a6577b00afd4b850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 3 Apr 2013 18:04:22 +0200
Subject: [PATCH] Shaders: support color alpha in FlatShader.

---
 src/Shaders/FlatShader.frag | 6 +++---
 src/Shaders/FlatShader.h    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Shaders/FlatShader.frag b/src/Shaders/FlatShader.frag
index d27192d22..8f3066029 100644
--- a/src/Shaders/FlatShader.frag
+++ b/src/Shaders/FlatShader.frag
@@ -27,9 +27,9 @@
 #endif
 
 #ifdef EXPLICIT_UNIFORM_LOCATION
-layout(location = 1) uniform vec3 color;
+layout(location = 1) uniform vec4 color;
 #else
-uniform lowp vec3 color;
+uniform lowp vec4 color;
 #endif
 
 #ifdef NEW_GLSL
@@ -37,5 +37,5 @@ out lowp vec4 fragmentColor;
 #endif
 
 void main() {
-    fragmentColor = vec4(color, 1.0);
+    fragmentColor = color;
 }
diff --git a/src/Shaders/FlatShader.h b/src/Shaders/FlatShader.h
index e2ff47e63..71f5e7d49 100644
--- a/src/Shaders/FlatShader.h
+++ b/src/Shaders/FlatShader.h
@@ -64,7 +64,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT FlatShader: public
          * @brief Set color
          * @return Pointer to self (for method chaining)
          */
-        FlatShader<dimensions>* setColor(const Color3<>& color) {
+        FlatShader<dimensions>* setColor(const Color4<>& color) {
             setUniform(colorUniform, color);
             return this;
         }