diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-07-08 14:25:54 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-07-11 18:39:50 -0700 |
commit | 822ec091da5f1810bcba8afbb7cde35476b2f119 (patch) | |
tree | 30ee3d6bd0abc9a6349344fcfb3596f0de280ce3 /src/mbgl/renderer/painter_line.cpp | |
parent | 462137a5360dc1d47a1cee654e43243e729befb7 (diff) | |
download | qtlocation-mapboxgl-822ec091da5f1810bcba8afbb7cde35476b2f119.tar.gz |
[core] Introduce non-anonymous Shaders class
Diffstat (limited to 'src/mbgl/renderer/painter_line.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_line.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp index ce1c6758fc..d2e6c4c29a 100644 --- a/src/mbgl/renderer/painter_line.cpp +++ b/src/mbgl/renderer/painter_line.cpp @@ -2,9 +2,7 @@ #include <mbgl/renderer/line_bucket.hpp> #include <mbgl/style/layers/line_layer.hpp> #include <mbgl/style/layers/line_layer_impl.hpp> -#include <mbgl/shader/line_shader.hpp> -#include <mbgl/shader/linesdf_shader.hpp> -#include <mbgl/shader/linepattern_shader.hpp> +#include <mbgl/shader/shaders.hpp> #include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/geometry/line_atlas.hpp> #include <mbgl/util/mat2.hpp> @@ -56,9 +54,9 @@ void Painter::renderLine(LineBucket& bucket, setDepthSublayer(0); const bool overdraw = isOverdraw(); - auto& linesdfShader = overdraw ? *overdrawShader.linesdf : *shader.linesdf; - auto& linepatternShader = overdraw ? *overdrawShader.linepattern : *shader.linepattern; - auto& lineShader = overdraw ? *overdrawShader.line : *shader.line; + auto& linesdfShader = overdraw ? overdrawShaders->linesdf : shaders->linesdf; + auto& linepatternShader = overdraw ? overdrawShaders->linepattern : shaders->linepattern; + auto& lineShader = overdraw ? overdrawShaders->line : shaders->line; if (!properties.lineDasharray.value.from.empty()) { config.program = linesdfShader.getID(); |