diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-24 17:57:08 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-25 21:37:58 -0700 |
| commit | c568a8ad77320c869d8e7c23b86426c094aceb6c (patch) | |
| tree | 24b821b4cd8f374344feaba4d3be51e9cc37d1a8 /src/mbgl/shader/plain_shader.hpp | |
| parent | d7a477b16586d830d9b0862f732302c4ae06aca5 (diff) | |
| download | qtlocation-mapboxgl-c568a8ad77320c869d8e7c23b86426c094aceb6c.tar.gz | |
[core] Port "separate u_opacity from u_color"
https://github.com/mapbox/mapbox-gl-shaders/commit/0d3412519618a3a1672db9fa21f96f90070cf84c
https://github.com/mapbox/mapbox-gl-js/commit/1f5afa7db08a2bdcc492a46e500ff5d020e6f4a2
Diffstat (limited to 'src/mbgl/shader/plain_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/plain_shader.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mbgl/shader/plain_shader.hpp b/src/mbgl/shader/plain_shader.hpp index 5aecde9b49..bb6a81b7eb 100644 --- a/src/mbgl/shader/plain_shader.hpp +++ b/src/mbgl/shader/plain_shader.hpp @@ -13,6 +13,7 @@ public: UniformMatrix<4> u_matrix = {"u_matrix", *this}; Uniform<std::array<GLfloat, 4>> u_color = {"u_color", *this}; + Uniform<GLfloat> u_opacity = {"u_opacity", *this}; }; } // namespace mbgl |