diff options
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/gl/uniform.hpp | 20 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_property_binder.hpp | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index d055ecfd1d..9e841c3c15 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -32,7 +32,7 @@ ActiveUniforms activeUniforms(ProgramID); #endif -template <class Tag, class T> +template <class T> class Uniform { public: using Value = T; @@ -53,23 +53,23 @@ public: }; }; -template <class Tag, class T> -using UniformScalar = Uniform<Tag, T>; +template <class T> +using UniformScalar = Uniform<T>; -template <class Tag, class T, size_t N> -using UniformVector = Uniform<Tag, std::array<T, N>>; +template <class T, size_t N> +using UniformVector = Uniform<std::array<T, N>>; -template <class Tag, class T, size_t N> -using UniformMatrix = Uniform<Tag, std::array<T, N*N>>; +template <class T, size_t N> +using UniformMatrix = Uniform<std::array<T, N*N>>; #define MBGL_DEFINE_UNIFORM_SCALAR(type_, name_) \ - struct name_ : ::mbgl::gl::UniformScalar<name_, type_> { static auto name() { return #name_; } } + struct name_ : ::mbgl::gl::UniformScalar<type_> { static auto name() { return #name_; } } #define MBGL_DEFINE_UNIFORM_VECTOR(type_, n_, name_) \ - struct name_ : ::mbgl::gl::UniformVector<name_, type_, n_> { static auto name() { return #name_; } } + struct name_ : ::mbgl::gl::UniformVector<type_, n_> { static auto name() { return #name_; } } #define MBGL_DEFINE_UNIFORM_MATRIX(type_, n_, name_) \ - struct name_ : ::mbgl::gl::UniformMatrix<name_, type_, n_> { static auto name() { return #name_; } } + struct name_ : ::mbgl::gl::UniformMatrix<type_, n_> { static auto name() { return #name_; } } UniformLocation uniformLocation(ProgramID, const char * name); diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp index 31abec68a9..a382597995 100644 --- a/src/mbgl/renderer/paint_property_binder.hpp +++ b/src/mbgl/renderer/paint_property_binder.hpp @@ -419,7 +419,7 @@ struct ZoomInterpolatedAttribute { }; template <class Attr> -struct InterpolationUniform : gl::UniformScalar<InterpolationUniform<Attr>, float> { +struct InterpolationUniform : gl::UniformScalar<float> { static auto name() { static const std::string name = Attr::name() + std::string("_t"); return name.c_str(); |