diff options
Diffstat (limited to 'src/mbgl/gl/uniform.hpp')
-rw-r--r-- | src/mbgl/gl/uniform.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index 62e201ee4b..c5aa2d6c39 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -51,8 +51,11 @@ public: UniformLocation uniformLocation(ProgramID, const char * name); +template <class> +class Uniforms; + template <class... Us> -class Uniforms final { +class Uniforms<TypeList<Us...>> final { public: using Types = TypeList<Us...>; using State = IndexedTuple<TypeList<Us...>, TypeList<UniformState<typename Us::Value>...>>; @@ -77,7 +80,7 @@ public: template <class Program> static State loadNamedLocations(const Program& program) { - return State(typename Us::State(program.uniformLocation(Us::name()))...); + return State(UniformState<typename Us::Value>(program.uniformLocation(Us::name()))...); } static NamedLocations getNamedLocations(const State& state) { @@ -89,8 +92,5 @@ public: } }; -template <class... Us> -using ConcatenateUniforms = typename TypeListConcat<typename Us::Types...>::template ExpandInto<Uniforms>; - } // namespace gl } // namespace mbgl |