[core] introduce TypeListConcat and TypeList::ExpandInto
This commit is contained in:
committed by
Molly Lloyd
parent
748e6bde5f
commit
5e9bbfdd44
@@ -252,7 +252,7 @@ public:
|
||||
using LayoutAttributes = LayoutAttrs;
|
||||
using LayoutVertex = typename LayoutAttributes::Vertex;
|
||||
|
||||
using LayoutAndSizeAttributes = gl::ConcatenateAttributes<LayoutAttributes, gl::ConcatenateAttributes<SymbolDynamicLayoutAttributes, SymbolOpacityAttributes>>;
|
||||
using LayoutAndSizeAttributes = gl::ConcatenateAttributes<LayoutAttributes, SymbolDynamicLayoutAttributes, SymbolOpacityAttributes>;
|
||||
|
||||
using PaintProperties = PaintProps;
|
||||
using PaintPropertyBinders = typename PaintProperties::Binders;
|
||||
@@ -262,7 +262,7 @@ public:
|
||||
using UniformValues = typename Uniforms::Values;
|
||||
using SizeUniforms = typename SymbolSizeBinder::Uniforms;
|
||||
using PaintUniforms = typename PaintPropertyBinders::Uniforms;
|
||||
using AllUniforms = gl::ConcatenateUniforms<Uniforms, gl::ConcatenateUniforms<SizeUniforms, PaintUniforms>>;
|
||||
using AllUniforms = gl::ConcatenateUniforms<Uniforms, SizeUniforms, PaintUniforms>;
|
||||
|
||||
using ProgramType = gl::Program<Primitive, Attributes, AllUniforms>;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user