diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-09-10 17:45:02 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-09-15 12:50:20 +0200 |
| commit | b2fcde5e8b098cedfd6f772740ebdac56678d828 (patch) | |
| tree | e19ec7c87b4dd067d04de2d7de2890fb114b01d2 /src/mbgl/shader/sdf_shader.hpp | |
| parent | 1f1b3fbbc213d5725d4bdbe5271de8fca617a05b (diff) | |
| download | qtlocation-mapboxgl-b2fcde5e8b098cedfd6f772740ebdac56678d828.tar.gz | |
[shader] GL types for all Shader attributes
Diffstat (limited to 'src/mbgl/shader/sdf_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/sdf_shader.hpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mbgl/shader/sdf_shader.hpp b/src/mbgl/shader/sdf_shader.hpp index a56f3b2eb4..fcb2e15d11 100644 --- a/src/mbgl/shader/sdf_shader.hpp +++ b/src/mbgl/shader/sdf_shader.hpp @@ -10,24 +10,24 @@ class SDFShader : public Shader { public: SDFShader(); - UniformMatrix<4> u_matrix = {"u_matrix", *this}; - UniformMatrix<4> u_exmatrix = {"u_exmatrix", *this}; - Uniform<std::array<float, 4>> u_color = {"u_color", *this}; - Uniform<std::array<float, 2>> u_texsize = {"u_texsize", *this}; - Uniform<float> u_buffer = {"u_buffer", *this}; - Uniform<float> u_gamma = {"u_gamma", *this}; - Uniform<float> u_zoom = {"u_zoom", *this}; - Uniform<float> u_fadedist = {"u_fadedist", *this}; - Uniform<float> u_minfadezoom = {"u_minfadezoom", *this}; - Uniform<float> u_maxfadezoom = {"u_maxfadezoom", *this}; - Uniform<float> u_fadezoom = {"u_fadezoom", *this}; - Uniform<int32_t> u_skewed = {"u_skewed", *this}; - Uniform<float> u_extra = {"u_extra", *this}; + UniformMatrix<4> u_matrix = {"u_matrix", *this}; + UniformMatrix<4> u_exmatrix = {"u_exmatrix", *this}; + Uniform<std::array<GLfloat, 4>> u_color = {"u_color", *this}; + Uniform<std::array<GLfloat, 2>> u_texsize = {"u_texsize", *this}; + Uniform<GLfloat> u_buffer = {"u_buffer", *this}; + Uniform<GLfloat> u_gamma = {"u_gamma", *this}; + Uniform<GLfloat> u_zoom = {"u_zoom", *this}; + Uniform<GLfloat> u_fadedist = {"u_fadedist", *this}; + Uniform<GLfloat> u_minfadezoom = {"u_minfadezoom", *this}; + Uniform<GLfloat> u_maxfadezoom = {"u_maxfadezoom", *this}; + Uniform<GLfloat> u_fadezoom = {"u_fadezoom", *this}; + Uniform<GLint> u_skewed = {"u_skewed", *this}; + Uniform<GLfloat> u_extra = {"u_extra", *this}; protected: - int32_t a_offset = -1; - int32_t a_data1 = -1; - int32_t a_data2 = -1; + GLint a_offset = -1; + GLint a_data1 = -1; + GLint a_data2 = -1; }; class SDFGlyphShader : public SDFShader { |