summaryrefslogtreecommitdiff
path: root/src/mbgl/shader/sdf_shader.hpp
diff options
context:
space:
mode:
authorYoung Hahn <young@mapbox.com>2016-06-15 11:38:22 -0400
committerGitHub <noreply@github.com>2016-06-15 11:38:22 -0400
commit24b66bc8cdd40a52e08d198c063daa3e1f6be92a (patch)
tree6d98a5e1216a83f7d6d4c78422c8306d4a4cb157 /src/mbgl/shader/sdf_shader.hpp
parentfe64238b4cd5a7da403a4f29a62b14234ecba569 (diff)
downloadqtlocation-mapboxgl-24b66bc8cdd40a52e08d198c063daa3e1f6be92a.tar.gz
Color class (#5361)
* Color class * Switch to list initialization
Diffstat (limited to 'src/mbgl/shader/sdf_shader.hpp')
-rw-r--r--src/mbgl/shader/sdf_shader.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/shader/sdf_shader.hpp b/src/mbgl/shader/sdf_shader.hpp
index 6889288c28..88f671b543 100644
--- a/src/mbgl/shader/sdf_shader.hpp
+++ b/src/mbgl/shader/sdf_shader.hpp
@@ -2,6 +2,7 @@
#include <mbgl/shader/shader.hpp>
#include <mbgl/shader/uniform.hpp>
+#include <mbgl/util/color.hpp>
namespace mbgl {
@@ -11,7 +12,7 @@ public:
UniformMatrix<4> u_matrix = {"u_matrix", *this};
Uniform<std::array<GLfloat, 2>> u_extrude_scale = {"u_extrude_scale", *this};
- Uniform<std::array<GLfloat, 4>> u_color = {"u_color", *this};
+ Uniform<Color> u_color = {"u_color", *this};
Uniform<GLfloat> u_opacity = {"u_opacity", *this};
Uniform<std::array<GLfloat, 2>> u_texsize = {"u_texsize", *this};
Uniform<GLfloat> u_buffer = {"u_buffer", *this};