diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-16 13:01:43 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-17 08:27:53 -0700 |
commit | 0dca6cd9bfdb1fb77f7755d639f92a6a1ba06dc1 (patch) | |
tree | c6fac4540cd77f4e815580fcc1f584860d815132 /src/mbgl/programs | |
parent | 9544dcc4834bf816e9e75f0aa9937a1562b2353f (diff) | |
download | qtlocation-mapboxgl-0dca6cd9bfdb1fb77f7755d639f92a6a1ba06dc1.tar.gz |
[core] Don't need to use normalized attributes anymore
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r-- | src/mbgl/programs/attributes.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp index a2e0772762..b015c06366 100644 --- a/src/mbgl/programs/attributes.hpp +++ b/src/mbgl/programs/attributes.hpp @@ -2,7 +2,6 @@ #include <mbgl/gl/attribute.hpp> #include <mbgl/gl/uniform.hpp> -#include <mbgl/gl/normalization.hpp> #include <cstdint> @@ -122,19 +121,19 @@ struct a_outline_color : gl::Attribute<float, 2> { } }; -struct a_opacity : gl::Attribute<gl::Normalized<uint8_t>, 1> { +struct a_opacity : gl::Attribute<float, 1> { static auto name() { return "a_opacity"; } static Value value(float opacity) { - return {{ gl::Normalized<uint8_t>(opacity) }}; + return {{ opacity }}; } }; -struct a_stroke_opacity : gl::Attribute<gl::Normalized<uint8_t>, 1> { +struct a_stroke_opacity : gl::Attribute<float, 1> { static auto name() { return "a_stroke_opacity"; } static Value value(float opacity) { - return {{ gl::Normalized<uint8_t>(opacity) }}; + return {{ opacity }}; } }; |