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.hpp | |
parent | 462137a5360dc1d47a1cee654e43243e729befb7 (diff) | |
download | qtlocation-mapboxgl-822ec091da5f1810bcba8afbb7cde35476b2f119.tar.gz |
[core] Introduce non-anonymous Shaders class
Diffstat (limited to 'src/mbgl/renderer/painter.hpp')
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 5e8831b239..dc8e2b7fca 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -41,19 +41,8 @@ class CircleBucket; class SymbolBucket; class RasterBucket; +class Shaders; class SDFShader; -class PlainShader; -class OutlineShader; -class OutlinePatternShader; -class LineShader; -class LinejoinShader; -class LineSDFShader; -class LinepatternShader; -class CircleShader; -class PatternShader; -class IconShader; -class RasterShader; -class CollisionBoxShader; struct ClipID; @@ -197,36 +186,8 @@ private: FrameHistory frameHistory; - struct { - std::unique_ptr<PlainShader> plain; - std::unique_ptr<OutlineShader> outline; - std::unique_ptr<OutlinePatternShader> outlinePattern; - std::unique_ptr<LineShader> line; - std::unique_ptr<LineSDFShader> linesdf; - std::unique_ptr<LinepatternShader> linepattern; - std::unique_ptr<PatternShader> pattern; - std::unique_ptr<IconShader> icon; - std::unique_ptr<RasterShader> raster; - std::unique_ptr<SDFShader> sdfGlyph; - std::unique_ptr<SDFShader> sdfIcon; - std::unique_ptr<CollisionBoxShader> collisionBox; - std::unique_ptr<CircleShader> circle; - } shader; - - struct { - std::unique_ptr<PlainShader> plain; - std::unique_ptr<OutlineShader> outline; - std::unique_ptr<OutlinePatternShader> outlinePattern; - std::unique_ptr<LineShader> line; - std::unique_ptr<LineSDFShader> linesdf; - std::unique_ptr<LinepatternShader> linepattern; - std::unique_ptr<PatternShader> pattern; - std::unique_ptr<IconShader> icon; - std::unique_ptr<RasterShader> raster; - std::unique_ptr<SDFShader> sdfGlyph; - std::unique_ptr<SDFShader> sdfIcon; - std::unique_ptr<CircleShader> circle; - } overdrawShader; + std::unique_ptr<Shaders> shaders; + std::unique_ptr<Shaders> overdrawShaders; // Set up the stencil quad we're using to generate the stencil mask. StaticVertexBuffer tileStencilBuffer { |