diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-06-04 23:58:02 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 12:21:50 -0700 |
commit | 1708b297a7c4eb6287e36837fd1cfe1220c5d97b (patch) | |
tree | 549d2ad2a2529ce1d9c626af585aae62f2247512 /src/mbgl/programs | |
parent | 2c6fcd9f44ff93593a3f21c9f993a1eb4b299bb4 (diff) | |
download | qtlocation-mapboxgl-1708b297a7c4eb6287e36837fd1cfe1220c5d97b.tar.gz |
[core] add constant DDS values as uniforms
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r-- | src/mbgl/programs/program.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp index a5db5cf8dc..3351f5eeae 100644 --- a/src/mbgl/programs/program.hpp +++ b/src/mbgl/programs/program.hpp @@ -62,7 +62,7 @@ public: std::move(stencilMode), std::move(colorMode), uniformValues - .concat(paintPropertyBinders.uniformValues(currentZoom)), + .concat(paintPropertyBinders.uniformValues(currentZoom, currentProperties)), LayoutAttributes::allVariableBindings(layoutVertexBuffer) .concat(paintPropertyBinders.attributeBindings(currentProperties)), indexBuffer, diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index f466a076ef..087d3a4567 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -377,7 +377,7 @@ public: std::move(colorMode), uniformValues .concat(symbolSizeBinder.uniformValues(currentZoom)) - .concat(paintPropertyBinders.uniformValues(currentZoom)), + .concat(paintPropertyBinders.uniformValues(currentZoom, currentProperties)), LayoutAttributes::allVariableBindings(layoutVertexBuffer) .concat(symbolSizeBinder.attributeBindings(currentSizeValue)) .concat(paintPropertyBinders.attributeBindings(currentProperties)), |