diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-03 12:07:13 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-07 18:51:47 +0100 |
| commit | bd3d4bc89a7ce072a32782f2113ef5d838a7913c (patch) | |
| tree | 4be6bb340ed22a5d90b74cf56114d7cc00236e01 /src/mbgl/renderer/painter_symbol.cpp | |
| parent | ed72581e0c9a1f42dda2d659a1596de20201ce3e (diff) | |
| download | qtlocation-mapboxgl-bd3d4bc89a7ce072a32782f2113ef5d838a7913c.tar.gz | |
[core] force explicit initialization of uniform values
force users to use the actual names to avoid implicit conversion accidentally targeting the wrong shader
Diffstat (limited to 'src/mbgl/renderer/painter_symbol.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index 11d48db90e..cf4bb9ee86 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -125,10 +125,10 @@ void Painter::renderSymbol(PaintParameters& parameters, colorModeForRenderPass(), shaders->collisionBox, CollisionBoxUniforms::Values { - tile.matrix, - std::pow(2.0f, state.getZoom() - tile.tile.id.overscaledZ), - state.getZoom() * 10, - (tile.id.canonical.z + 1) * 10 + uniforms::u_matrix::Value{ tile.matrix }, + uniforms::u_scale::Value{ std::pow(2.0f, float(state.getZoom() - tile.tile.id.overscaledZ)) }, + uniforms::u_zoom::Value{ float(state.getZoom() * 10) }, + uniforms::u_maxzoom::Value{ float((tile.id.canonical.z + 1) * 10) }, }, gl::Unindexed<gl::Lines>( *bucket.collisionBox.vertexBuffer, |