diff options
| author | Amy Lee Walton <amylee@mapbox.com> | 2016-08-11 09:49:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 09:49:36 -0700 |
| commit | b0cb8715ed74678b4d0f05829fa71a590e41b2f6 (patch) | |
| tree | af1ee87674c0963328b3c3bbdc5685270d647896 /src/mbgl/shader/shader.hpp | |
| parent | 89190f8d891f7734a3db3267afb746cf83e872d5 (diff) | |
| download | qtlocation-mapboxgl-b0cb8715ed74678b4d0f05829fa71a590e41b2f6.tar.gz | |
CJK overflow - update to match gl-shader (#5908)
* update vertex array ushorts
* update atlas size
* testing latest cjk test-suite branch
* update shader ref
* update shaders
* update icon buffer
* shaders
* updated tests
* buffer fix
* updated make tests
* annotation expected updates
* final push
* final fonts
* a_data1 removal
* remove cjk-mixed test
* hiring threshold for cjk-chinese
* update to new test suite
* Rename a_data2 to a_data in sdf and icon shaders
* update test-suite sha
Diffstat (limited to 'src/mbgl/shader/shader.hpp')
| -rw-r--r-- | src/mbgl/shader/shader.hpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp index f7da0c91ab..620e8f1368 100644 --- a/src/mbgl/shader/shader.hpp +++ b/src/mbgl/shader/shader.hpp @@ -34,9 +34,7 @@ protected: static constexpr GLint a_extrude = 1; static constexpr GLint a_offset = 2; static constexpr GLint a_data = 3; - static constexpr GLint a_data1 = 4; - static constexpr GLint a_data2 = 5; - static constexpr GLint a_texture_pos = 6; + static constexpr GLint a_texture_pos = 4; private: bool compileShader(gl::UniqueShader&, const GLchar *source); |