diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-04 15:26:00 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-06 14:47:58 -0700 |
commit | 21d7ee11e1cc0cd129f40df5bea2e07bfcc2a9e4 (patch) | |
tree | 771918967c0bdad79ba98f231d50436e633de369 /src/mbgl/renderer/painter.hpp | |
parent | 388fa9cf1039493f98f24005d1c7ddaa0ff95b3d (diff) | |
download | qtlocation-mapboxgl-21d7ee11e1cc0cd129f40df5bea2e07bfcc2a9e4.tar.gz |
[core] Rationalize shader names
{layer type}{subtype}Shader
Diffstat (limited to 'src/mbgl/renderer/painter.hpp')
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index bfa893f28e..28aa5aab44 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -10,7 +10,7 @@ #include <mbgl/gl/vao.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/shader/plain_vertex.hpp> +#include <mbgl/shader/fill_vertex.hpp> #include <mbgl/shader/raster_vertex.hpp> #include <mbgl/style/style.hpp> @@ -41,7 +41,7 @@ class SymbolBucket; class RasterBucket; class Shaders; -class SDFShader; +class SymbolSDFShader; class PaintParameters; struct ClipID; @@ -121,8 +121,8 @@ private: const RenderTile&, float scaleDivisor, std::array<float, 2> texsize, - SDFShader& sdfShader, - void (SymbolBucket::*drawSDF)(SDFShader&, gl::Context&, PaintMode), + SymbolSDFShader& sdfShader, + void (SymbolBucket::*drawSDF)(SymbolSDFShader&, gl::Context&, PaintMode), // Layout style::AlignmentType rotationAlignment, @@ -188,8 +188,8 @@ private: std::unique_ptr<Shaders> overdrawShaders; #endif - gl::VertexBuffer<PlainVertex> tileTriangleVertexBuffer; - gl::VertexBuffer<PlainVertex> tileLineStripVertexBuffer; + gl::VertexBuffer<FillVertex> tileTriangleVertexBuffer; + gl::VertexBuffer<FillVertex> tileLineStripVertexBuffer; gl::VertexBuffer<RasterVertex> rasterVertexBuffer; gl::VertexArrayObject tileBorderArray; |