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 DistanceFieldVector::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(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 Flat::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(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(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 Vector::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(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 VertexColor::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(version))