From 3be4422ded24cec3e5d027ba6de3b7c8f8d79225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 22 Jul 2014 22:17:58 +0200
Subject: [PATCH] Shaders: using attachShaders() everywhere.

---
 src/Magnum/Shaders/DistanceFieldVector.cpp | 3 +--
 src/Magnum/Shaders/Flat.cpp                | 3 +--
 src/Magnum/Shaders/MeshVisualizer.cpp      | 3 +--
 src/Magnum/Shaders/Phong.cpp               | 3 +--
 src/Magnum/Shaders/Vector.cpp              | 3 +--
 src/Magnum/Shaders/VertexColor.cpp         | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Magnum/Shaders/DistanceFieldVector.cpp b/src/Magnum/Shaders/DistanceFieldVector.cpp
index 6479807ae..6faef96f9 100644
--- a/src/Magnum/Shaders/DistanceFieldVector.cpp
+++ b/src/Magnum/Shaders/DistanceFieldVector.cpp
@@ -59,8 +59,7 @@ template<UnsignedInt dimensions> DistanceFieldVector<dimensions>::DistanceFieldV
 
     CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({frag, vert}));
 
-    AbstractShaderProgram::attachShader(frag);
-    AbstractShaderProgram::attachShader(vert);
+    AbstractShaderProgram::attachShaders({frag, vert});
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_attrib_location>(version))
diff --git a/src/Magnum/Shaders/Flat.cpp b/src/Magnum/Shaders/Flat.cpp
index 387e2c1f6..b75bf4d53 100644
--- a/src/Magnum/Shaders/Flat.cpp
+++ b/src/Magnum/Shaders/Flat.cpp
@@ -64,8 +64,7 @@ template<UnsignedInt dimensions> Flat<dimensions>::Flat(const Flags flags): tran
 
     CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag}));
 
-    attachShader(vert);
-    attachShader(frag);
+    attachShaders({vert, frag});
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_attrib_location>(version))
diff --git a/src/Magnum/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp
index 25155fc73..d5c78e570 100644
--- a/src/Magnum/Shaders/MeshVisualizer.cpp
+++ b/src/Magnum/Shaders/MeshVisualizer.cpp
@@ -87,8 +87,7 @@ MeshVisualizer::MeshVisualizer(const Flags flags): flags(flags), transformationP
     #endif
         Shader::compile({vert, frag});
 
-    attachShader(vert);
-    attachShader(frag);
+    attachShaders({vert, frag});
     #ifndef MAGNUM_TARGET_GLES
     if(geom) attachShader(*geom);
     #endif
diff --git a/src/Magnum/Shaders/Phong.cpp b/src/Magnum/Shaders/Phong.cpp
index 21f346d16..5ae33d71c 100644
--- a/src/Magnum/Shaders/Phong.cpp
+++ b/src/Magnum/Shaders/Phong.cpp
@@ -66,8 +66,7 @@ Phong::Phong(const Flags flags): transformationMatrixUniform(0), projectionMatri
 
     CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag}));
 
-    attachShader(vert);
-    attachShader(frag);
+    attachShaders({vert, frag});
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_attrib_location>(version))
diff --git a/src/Magnum/Shaders/Vector.cpp b/src/Magnum/Shaders/Vector.cpp
index c02411e5e..c3e855487 100644
--- a/src/Magnum/Shaders/Vector.cpp
+++ b/src/Magnum/Shaders/Vector.cpp
@@ -59,8 +59,7 @@ template<UnsignedInt dimensions> Vector<dimensions>::Vector(): transformationPro
 
     CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag}));
 
-    AbstractShaderProgram::attachShader(vert);
-    AbstractShaderProgram::attachShader(frag);
+    AbstractShaderProgram::attachShaders({vert,  frag});
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_attrib_location>(version))
diff --git a/src/Magnum/Shaders/VertexColor.cpp b/src/Magnum/Shaders/VertexColor.cpp
index fe4688f6f..f72450d4d 100644
--- a/src/Magnum/Shaders/VertexColor.cpp
+++ b/src/Magnum/Shaders/VertexColor.cpp
@@ -59,8 +59,7 @@ template<UnsignedInt dimensions> VertexColor<dimensions>::VertexColor(): transfo
 
     CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag}));
 
-    attachShader(vert);
-    attachShader(frag);
+    attachShaders({vert, frag});
 
     #ifndef MAGNUM_TARGET_GLES
     if(!Context::current()->isExtensionSupported<Extensions::GL::ARB::explicit_attrib_location>(version))