summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/symbol_program.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs/symbol_program.cpp')
-rw-r--r--src/mbgl/programs/symbol_program.cpp27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp
index bfc0133676..1f1bbd49b5 100644
--- a/src/mbgl/programs/symbol_program.cpp
+++ b/src/mbgl/programs/symbol_program.cpp
@@ -156,6 +156,33 @@ SymbolSDFProgram<Name, PaintProperties>::layoutUniformValues(const bool isText,
);
}
+SymbolTextAndIconProgram::LayoutUniformValues SymbolTextAndIconProgram::layoutUniformValues(
+ const bool hasVariablePacement,
+ const style::SymbolPropertyValues& values,
+ const Size& texsize,
+ const Size& texsize_icon,
+ const std::array<float, 2>& pixelsToGLUnits,
+ const float pixelRatio,
+ const bool alongLine,
+ const RenderTile& tile,
+ const TransformState& state,
+ const float symbolFadeChange,
+ const SymbolSDFPart part) {
+ return SymbolTextAndIconProgram::LayoutUniformValues(
+ SymbolSDFProgram<SymbolSDFTextProgram, style::TextPaintProperties>::layoutUniformValues(true,
+ hasVariablePacement,
+ values,
+ texsize,
+ pixelsToGLUnits,
+ pixelRatio,
+ alongLine,
+ tile,
+ state,
+ symbolFadeChange,
+ part)
+ .concat(gfx::UniformValues<SymbolTextAndIconProgramUniforms>(uniforms::texsize::Value(texsize_icon))));
+}
+
template class SymbolSDFProgram<SymbolSDFIconProgram, style::IconPaintProperties>;
template class SymbolSDFProgram<SymbolSDFTextProgram, style::TextPaintProperties>;