From 81f02a24c6118249fc92a114cb721040d9d8a33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 19 Nov 2013 13:31:06 +0100
Subject: [PATCH] Shaders: compile shaders also for GLSL 1.50 (GL 3.2).

It seems that ARB_explicit_attrib_location is not supported on GLSL 1.40
on OSX (even that the support is advertised).
---
 src/Shaders/DistanceFieldVector.cpp | 2 +-
 src/Shaders/Flat.cpp                | 2 +-
 src/Shaders/Phong.cpp               | 2 +-
 src/Shaders/Vector.cpp              | 2 +-
 src/Shaders/VertexColor.cpp         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Shaders/DistanceFieldVector.cpp b/src/Shaders/DistanceFieldVector.cpp
index 0916f30d5..d26e2280a 100644
--- a/src/Shaders/DistanceFieldVector.cpp
+++ b/src/Shaders/DistanceFieldVector.cpp
@@ -42,7 +42,7 @@ template<UnsignedInt dimensions> DistanceFieldVector<dimensions>::DistanceFieldV
     Utility::Resource rs("MagnumShaders");
 
     #ifndef MAGNUM_TARGET_GLES
-    const Version version = Context::current()->supportedVersion({Version::GL310, Version::GL300, Version::GL210});
+    const Version version = Context::current()->supportedVersion({Version::GL320, Version::GL310, Version::GL300, Version::GL210});
     #else
     const Version version = Context::current()->supportedVersion({Version::GLES300, Version::GLES200});
     #endif
diff --git a/src/Shaders/Flat.cpp b/src/Shaders/Flat.cpp
index 2ed8c5dcd..7f3f289ae 100644
--- a/src/Shaders/Flat.cpp
+++ b/src/Shaders/Flat.cpp
@@ -41,7 +41,7 @@ template<UnsignedInt dimensions> Flat<dimensions>::Flat(const Flags flags): tran
     Utility::Resource rs("MagnumShaders");
 
     #ifndef MAGNUM_TARGET_GLES
-    const Version version = Context::current()->supportedVersion({Version::GL310, Version::GL300, Version::GL210});
+    const Version version = Context::current()->supportedVersion({Version::GL320, Version::GL310, Version::GL300, Version::GL210});
     #else
     const Version version = Context::current()->supportedVersion({Version::GLES300, Version::GLES200});
     #endif
diff --git a/src/Shaders/Phong.cpp b/src/Shaders/Phong.cpp
index 62366837a..a6e2bce8b 100644
--- a/src/Shaders/Phong.cpp
+++ b/src/Shaders/Phong.cpp
@@ -35,7 +35,7 @@ Phong::Phong(const Flags flags): transformationMatrixUniform(0), projectionMatri
     Utility::Resource rs("MagnumShaders");
 
     #ifndef MAGNUM_TARGET_GLES
-    const Version version = Context::current()->supportedVersion({Version::GL310, Version::GL300, Version::GL210});
+    const Version version = Context::current()->supportedVersion({Version::GL320, Version::GL310, Version::GL300, Version::GL210});
     #else
     const Version version = Context::current()->supportedVersion({Version::GLES300, Version::GLES200});
     #endif
diff --git a/src/Shaders/Vector.cpp b/src/Shaders/Vector.cpp
index 301ef4770..76ee1da9b 100644
--- a/src/Shaders/Vector.cpp
+++ b/src/Shaders/Vector.cpp
@@ -42,7 +42,7 @@ template<UnsignedInt dimensions> Vector<dimensions>::Vector(): transformationPro
     Utility::Resource rs("MagnumShaders");
 
     #ifndef MAGNUM_TARGET_GLES
-    const Version version = Context::current()->supportedVersion({Version::GL310, Version::GL300, Version::GL210});
+    const Version version = Context::current()->supportedVersion({Version::GL320, Version::GL310, Version::GL300, Version::GL210});
     #else
     const Version version = Context::current()->supportedVersion({Version::GLES300, Version::GLES200});
     #endif
diff --git a/src/Shaders/VertexColor.cpp b/src/Shaders/VertexColor.cpp
index d059949e2..7cccca382 100644
--- a/src/Shaders/VertexColor.cpp
+++ b/src/Shaders/VertexColor.cpp
@@ -41,7 +41,7 @@ template<UnsignedInt dimensions> VertexColor<dimensions>::VertexColor(): transfo
     Utility::Resource rs("MagnumShaders");
 
     #ifndef MAGNUM_TARGET_GLES
-    const Version version = Context::current()->supportedVersion({Version::GL310, Version::GL300, Version::GL210});
+    const Version version = Context::current()->supportedVersion({Version::GL320, Version::GL310, Version::GL300, Version::GL210});
     #else
     const Version version = Context::current()->supportedVersion({Version::GLES300, Version::GLES200});
     #endif