From 824fc4974a7de938104a7f63a27e5848afddc9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 22 Jul 2014 22:18:50 +0200 Subject: [PATCH] TextureTools: use threaded shader compilation also here. --- src/Magnum/TextureTools/DistanceField.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Magnum/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp index 1145732bd..2542977f7 100644 --- a/src/Magnum/TextureTools/DistanceField.cpp +++ b/src/Magnum/TextureTools/DistanceField.cpp @@ -85,17 +85,17 @@ DistanceFieldShader::DistanceFieldShader(): radiusUniform(0), scalingUniform(1) #endif Shader vert(v, Shader::Type::Vertex); + Shader frag(v, Shader::Type::Fragment); + vert.addSource(rs.get("compatibility.glsl")) .addSource(rs.get("FullScreenTriangle.glsl")) .addSource(rs.get("DistanceFieldShader.vert")); - CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile()); - attachShader(vert); - - Shader frag(v, Shader::Type::Fragment); frag.addSource(rs.get("compatibility.glsl")) .addSource(rs.get("DistanceFieldShader.frag")); - CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile()); - attachShader(frag); + + CORRADE_INTERNAL_ASSERT_OUTPUT(Shader::compile({vert, frag})); + + attachShaders({vert, frag}); /* Older GLSL doesn't have gl_VertexID, vertices must be supplied explicitly */ #ifndef MAGNUM_TARGET_GLES