summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/symbol_program.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-07 13:08:30 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-12 11:03:54 +0100
commitcb64c380fbbd209cb68af60e76b7a770805353a8 (patch)
tree77b790ae49e8f5877be599a0dad2f413a98da43f /src/mbgl/programs/symbol_program.hpp
parent54847ea98698c85da156874dc84088772599ee3b (diff)
downloadqtlocation-mapboxgl-cb64c380fbbd209cb68af60e76b7a770805353a8.tar.gz
[core] add texture bindings to draw call invocations
Diffstat (limited to 'src/mbgl/programs/symbol_program.hpp')
-rw-r--r--src/mbgl/programs/symbol_program.hpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
index 4dce66ad4a..9c5bd01ef8 100644
--- a/src/mbgl/programs/symbol_program.hpp
+++ b/src/mbgl/programs/symbol_program.hpp
@@ -263,7 +263,9 @@ public:
using PaintUniformList = typename Binders::UniformList;
using AllUniforms = gl::Uniforms<TypeListConcat<UniformList, SizeUniformList, PaintUniformList>>;
- using ProgramType = gl::Program<Primitive, Attributes, AllUniforms>;
+ using TextureBindings = gfx::TextureBindings<TextureList>;
+
+ using ProgramType = gl::Program<Primitive, Attributes, AllUniforms, TextureBindings>;
ProgramType program;
@@ -315,6 +317,7 @@ public:
const SegmentVector<Attributes>& segments,
const typename AllUniforms::Values& allUniformValues,
const typename Attributes::Bindings& allAttributeBindings,
+ const TextureBindings& textureBindings,
const std::string& layerID) {
for (auto& segment : segments) {
auto vertexArrayIt = segment.vertexArrays.find(layerID);
@@ -333,6 +336,7 @@ public:
allUniformValues,
vertexArrayIt->second,
Attributes::offsetBindings(allAttributeBindings, segment.vertexOffset),
+ textureBindings,
indexBuffer,
segment.indexOffset,
segment.indexLength);