diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-09-05 11:52:23 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-09-05 13:23:14 -0700 |
| commit | 9d5f02ccaa051a0f3459f6fc94df807338fa2552 (patch) | |
| tree | 0b13c6913c61aa01e928983a0e33f1a0bd197ad4 /include/mbgl | |
| parent | 7b9ad022a904110eb15260b2cbf56e6f6b8a03cf (diff) | |
| download | qtlocation-mapboxgl-9d5f02ccaa051a0f3459f6fc94df807338fa2552.tar.gz | |
Match js shaders
The only non-incidental change is to revert portions
of d5b4c116 and 3a9a9043.
See https://github.com/mapbox/mapbox-gl-native/commit/d5b4c1162dab706d6f56881e3f72baa003ad8ac7#commitcomment-7668050
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/shader/linepattern_shader.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/shader/sdf_shader.hpp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/mbgl/shader/linepattern_shader.hpp b/include/mbgl/shader/linepattern_shader.hpp index bd22c99a19..bf85940b8a 100644 --- a/include/mbgl/shader/linepattern_shader.hpp +++ b/include/mbgl/shader/linepattern_shader.hpp @@ -12,7 +12,7 @@ public: void bind(char *offset); - UniformMatrix<4> u_matrix = {"u_posmatrix", *this}; + UniformMatrix<4> u_matrix = {"u_matrix", *this}; UniformMatrix<4> u_exmatrix = {"u_exmatrix", *this}; Uniform<std::array<float, 2>> u_linewidth = {"u_linewidth", *this}; Uniform<std::array<float, 2>> u_pattern_size = {"u_pattern_size", *this}; diff --git a/include/mbgl/shader/sdf_shader.hpp b/include/mbgl/shader/sdf_shader.hpp index 85104e2f96..ba1937d3c3 100644 --- a/include/mbgl/shader/sdf_shader.hpp +++ b/include/mbgl/shader/sdf_shader.hpp @@ -29,8 +29,13 @@ public: private: int32_t a_pos = -1; int32_t a_offset = -1; - int32_t a_data1 = -1; - int32_t a_data2 = -1; + int32_t a_tex = -1; + int32_t a_angle = -1; + int32_t a_minzoom = -1; + int32_t a_maxzoom = -1; + int32_t a_rangeend = -1; + int32_t a_rangestart = -1; + int32_t a_labelminzoom = -1; }; } |