diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index 9f2d06df2..f0ef2c799 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -54,6 +54,7 @@ void Painter::renderSDF(SymbolBucket &bucket, sdfShader.u_exmatrix = exMatrix; sdfShader.u_texsize = texsize; sdfShader.u_skewed = skewed; + sdfShader.u_texture = 0; // adjust min/max zooms for variable font sies float zoomAdjust = std::log(fontSize / bucketProperties.size) / std::log(2); @@ -232,6 +233,7 @@ void Painter::renderSymbol(SymbolBucket& bucket, const SymbolLayer& layer, const iconShader->u_texsize = {{ float(spriteAtlas->getWidth()) / 4.0f, float(spriteAtlas->getHeight()) / 4.0f }}; iconShader->u_skewed = skewed; iconShader->u_extra = extra; + iconShader->u_texture = 0; // adjust min/max zooms for variable font sies float zoomAdjust = std::log(fontSize / layout.icon.size) / std::log(2); diff --git a/src/mbgl/shader/icon_shader.hpp b/src/mbgl/shader/icon_shader.hpp index df6232cdc..8a25b635f 100644 --- a/src/mbgl/shader/icon_shader.hpp +++ b/src/mbgl/shader/icon_shader.hpp @@ -23,6 +23,7 @@ public: Uniform> u_texsize = {"u_texsize", *this}; Uniform u_skewed = {"u_skewed", *this}; Uniform u_extra = {"u_extra", *this}; + Uniform u_texture = {"u_texture", *this}; protected: GLint a_offset = -1; diff --git a/src/mbgl/shader/sdf_shader.hpp b/src/mbgl/shader/sdf_shader.hpp index a6f9ce105..29dbfea04 100644 --- a/src/mbgl/shader/sdf_shader.hpp +++ b/src/mbgl/shader/sdf_shader.hpp @@ -22,6 +22,7 @@ public: Uniform u_maxfadezoom = {"u_maxfadezoom", *this}; Uniform u_fadezoom = {"u_fadezoom", *this}; Uniform u_skewed = {"u_skewed", *this}; + Uniform u_texture = {"u_texture", *this}; protected: GLint a_offset = -1;