[core] add texture bindings to draw call invocations

This commit is contained in:
Konstantin Käfer
2019-03-07 13:08:30 +01:00
parent 54847ea986
commit cb64c380fb
17 changed files with 127 additions and 26 deletions

View File

@@ -35,7 +35,9 @@ public:
using PaintUniformList = typename Binders::UniformList;
using AllUniforms = gl::Uniforms<TypeListConcat<UniformList, PaintUniformList>>;
using ProgramType = gl::Program<Primitive, Attributes, AllUniforms>;
using TextureBindings = gfx::TextureBindings<TextureList>;
using ProgramType = gl::Program<Primitive, Attributes, AllUniforms, TextureBindings>;
ProgramType program;
@@ -80,6 +82,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);
@@ -98,6 +101,7 @@ public:
allUniformValues,
vertexArrayIt->second,
Attributes::offsetBindings(allAttributeBindings, segment.vertexOffset),
textureBindings,
indexBuffer,
segment.indexOffset,
segment.indexLength);