diff options
Diffstat (limited to 'src/mbgl/programs/symbol_program.cpp')
| -rw-r--r-- | src/mbgl/programs/symbol_program.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp index bd43237b8f..d224f3bac2 100644 --- a/src/mbgl/programs/symbol_program.cpp +++ b/src/mbgl/programs/symbol_program.cpp @@ -84,8 +84,8 @@ SymbolIconProgram::uniformValues(const bool isText, ); } -template <class PaintProperties> -typename SymbolSDFProgram<PaintProperties>::UniformValues SymbolSDFProgram<PaintProperties>::uniformValues( +SymbolSDFUniforms::Values +symbolSDFUniformValues( const bool isText, const style::SymbolPropertyValues& values, const Size& texsize, @@ -98,7 +98,7 @@ typename SymbolSDFProgram<PaintProperties>::UniformValues SymbolSDFProgram<Paint ? std::cos(state.getPitch()) : 1.0) * state.getCameraToCenterDistance(); - return makeValues<SymbolSDFProgram<PaintProperties>::UniformValues>( + return makeValues<SymbolSDFUniforms::Values>( isText, values, texsize, @@ -113,7 +113,4 @@ typename SymbolSDFProgram<PaintProperties>::UniformValues SymbolSDFProgram<Paint ); } -template class SymbolSDFProgram<style::IconPaintProperties>; -template class SymbolSDFProgram<style::TextPaintProperties>; - } // namespace mbgl |