summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/symbol_program.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-06 11:55:58 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-11 14:04:18 +0100
commit2721e82abc3f981fb0ff516c745cb354111a6319 (patch)
tree40556af38bd0a88c335a9d8e67364acdcb386e13 /src/mbgl/programs/symbol_program.hpp
parent929126fba084761877e6c1059626baf9e95f4b70 (diff)
downloadqtlocation-mapboxgl-2721e82abc3f981fb0ff516c745cb354111a6319.tar.gz
[core] add place for specifying textures/samplers separately from uniforms
Diffstat (limited to 'src/mbgl/programs/symbol_program.hpp')
-rw-r--r--src/mbgl/programs/symbol_program.hpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
index 76c3057852..4dce66ad4a 100644
--- a/src/mbgl/programs/symbol_program.hpp
+++ b/src/mbgl/programs/symbol_program.hpp
@@ -244,6 +244,7 @@ template <class Shaders,
class Primitive,
class LayoutAttributeList,
class UniformList,
+ class TextureList,
class PaintProps>
class SymbolProgram : public SymbolProgramBase {
public:
@@ -357,6 +358,7 @@ class SymbolIconProgram : public SymbolProgram<
uniforms::u_pitch_with_map,
uniforms::u_rotate_symbol,
uniforms::u_aspect_ratio>,
+ TypeList<>,
style::IconPaintProperties>
{
public:
@@ -398,6 +400,7 @@ class SymbolSDFProgram : public SymbolProgram<
uniforms::u_aspect_ratio,
uniforms::u_gamma_scale,
uniforms::u_is_halo>,
+ TypeList<>,
PaintProperties>
{
public:
@@ -420,6 +423,7 @@ public:
uniforms::u_aspect_ratio,
uniforms::u_gamma_scale,
uniforms::u_is_halo>,
+ TypeList<>,
PaintProperties>;
using UniformValues = typename BaseProgram::UniformValues;