diff options
Diffstat (limited to 'src/mbgl/renderer/painter.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index bcbb75e69a..a8e420215f 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -26,7 +26,6 @@ #include <mbgl/shader/dot_shader.hpp> #include <mbgl/shader/gaussian_shader.hpp> -#include <mbgl/util/std.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/mat3.hpp> @@ -94,18 +93,18 @@ void Painter::setup() { } void Painter::setupShaders() { - if (!plainShader) plainShader = util::make_unique<PlainShader>(); - if (!outlineShader) outlineShader = util::make_unique<OutlineShader>(); - if (!lineShader) lineShader = util::make_unique<LineShader>(); - if (!linesdfShader) linesdfShader = util::make_unique<LineSDFShader>(); - if (!linepatternShader) linepatternShader = util::make_unique<LinepatternShader>(); - if (!patternShader) patternShader = util::make_unique<PatternShader>(); - if (!iconShader) iconShader = util::make_unique<IconShader>(); - if (!rasterShader) rasterShader = util::make_unique<RasterShader>(); - if (!sdfGlyphShader) sdfGlyphShader = util::make_unique<SDFGlyphShader>(); - if (!sdfIconShader) sdfIconShader = util::make_unique<SDFIconShader>(); - if (!dotShader) dotShader = util::make_unique<DotShader>(); - if (!gaussianShader) gaussianShader = util::make_unique<GaussianShader>(); + if (!plainShader) plainShader = std::make_unique<PlainShader>(); + if (!outlineShader) outlineShader = std::make_unique<OutlineShader>(); + if (!lineShader) lineShader = std::make_unique<LineShader>(); + if (!linesdfShader) linesdfShader = std::make_unique<LineSDFShader>(); + if (!linepatternShader) linepatternShader = std::make_unique<LinepatternShader>(); + if (!patternShader) patternShader = std::make_unique<PatternShader>(); + if (!iconShader) iconShader = std::make_unique<IconShader>(); + if (!rasterShader) rasterShader = std::make_unique<RasterShader>(); + if (!sdfGlyphShader) sdfGlyphShader = std::make_unique<SDFGlyphShader>(); + if (!sdfIconShader) sdfIconShader = std::make_unique<SDFIconShader>(); + if (!dotShader) dotShader = std::make_unique<DotShader>(); + if (!gaussianShader) gaussianShader = std::make_unique<GaussianShader>(); } void Painter::resize() { |