[shader] GL types for all Shader attributes

16 files changed, 126 insertions, 126 deletions

diff --git a/src/mbgl/shader/box_shader.cpp b/src/mbgl/shader/box_shader.cpp
index ffcce815f0..beb5e15f9e 100644
--- a/src/mbgl/shader/box_shader.cpp
+++ b/src/mbgl/shader/box_shader.cpp
@@ -17,7 +17,7 @@ CollisionBoxShader::CollisionBoxShader()
 }
 
 void CollisionBoxShader::bind(GLbyte *offset) {
-    const int stride = 12;
+    const GLint stride = 12;
 
     MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
     MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, stride, offset + 0));
diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/box_shader.hpp
index 20d1deec62..19df2ca825 100644
--- a/src/mbgl/shader/box_shader.hpp
+++ b/src/mbgl/shader/box_shader.hpp
@@ -14,15 +14,15 @@ public:
     void bind(GLbyte *offset) final;
 
     UniformMatrix<4>              u_matrix      = {"u_matrix",      *this};
-    Uniform<float>                u_scale      = {"u_scale",      *this};
-    Uniform<float>                u_zoom        = {"u_zoom",        *this};
-    Uniform<float>                u_maxzoom        = {"u_maxzoom",        *this};
+    Uniform<GLfloat>              u_scale       = {"u_scale",       *this};
+    Uniform<GLfloat>              u_zoom        = {"u_zoom",        *this};
+    Uniform<GLfloat>              u_maxzoom     = {"u_maxzoom",     *this};
 
 protected:
-    int32_t a_extrude = -1;
-    int32_t a_data = -1;
+    GLint a_extrude = -1;
+    GLint a_data = -1;
 };
 
-}
+} // namespace mbgl
 
-#endif
+#endif // MBGL_SHADER_BOX_SHADER
diff --git a/src/mbgl/shader/circle_shader.hpp b/src/mbgl/shader/circle_shader.hpp
index 58314e837d..84f4ef99a1 100644
--- a/src/mbgl/shader/circle_shader.hpp
+++ b/src/mbgl/shader/circle_shader.hpp
@@ -12,11 +12,11 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    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<float>                 u_size     = {"u_size",     *this};
-    Uniform<float>                 u_blur     = {"u_blur",     *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<GLfloat>                 u_size     = {"u_size",     *this};
+    Uniform<GLfloat>                 u_blur     = {"u_blur",     *this};
 };
 
 }
diff --git a/src/mbgl/shader/dot_shader.hpp b/src/mbgl/shader/dot_shader.hpp
index 45ac1c26cd..fe1541cf75 100644
--- a/src/mbgl/shader/dot_shader.hpp
+++ b/src/mbgl/shader/dot_shader.hpp
@@ -12,10 +12,10 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    UniformMatrix<4>              u_matrix = {"u_matrix", *this};
-    Uniform<std::array<float, 4>> u_color  = {"u_color",  *this};
-    Uniform<float>                u_size   = {"u_size",   *this};
-    Uniform<float>                u_blur   = {"u_blur",   *this};
+    UniformMatrix<4>                u_matrix = {"u_matrix", *this};
+    Uniform<std::array<GLfloat, 4>> u_color  = {"u_color",  *this};
+    Uniform<GLfloat>                u_size   = {"u_size",   *this};
+    Uniform<GLfloat>                u_blur   = {"u_blur",   *this};
 };
 
 }
diff --git a/src/mbgl/shader/icon_shader.cpp b/src/mbgl/shader/icon_shader.cpp
index 736bb47e72..a9b4be23e8 100644
--- a/src/mbgl/shader/icon_shader.cpp
+++ b/src/mbgl/shader/icon_shader.cpp
@@ -18,7 +18,7 @@ IconShader::IconShader()
 }
 
 void IconShader::bind(GLbyte *offset) {
-    const int stride = 16;
+    const GLsizei stride = 16;
 
     MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos));
     MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, stride, offset + 0));
diff --git a/src/mbgl/shader/icon_shader.hpp b/src/mbgl/shader/icon_shader.hpp
index a0e9397f09..437fd859bc 100644
--- a/src/mbgl/shader/icon_shader.hpp
+++ b/src/mbgl/shader/icon_shader.hpp
@@ -12,22 +12,22 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    UniformMatrix<4>              u_matrix      = {"u_matrix",      *this};
-    UniformMatrix<4>              u_exmatrix    = {"u_exmatrix",    *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<float>                u_opacity     = {"u_opacity",     *this};
-    Uniform<std::array<float, 2>> u_texsize     = {"u_texsize",     *this};
-    Uniform<int32_t>              u_skewed      = {"u_skewed",      *this};
-    Uniform<float>                u_extra       = {"u_extra",       *this};
-
-private:
-    int32_t a_offset = -1;
-    int32_t a_data1 = -1;
-    int32_t a_data2 = -1;
+    UniformMatrix<4>                u_matrix      = {"u_matrix",      *this};
+    UniformMatrix<4>                u_exmatrix    = {"u_exmatrix",    *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<GLfloat>                u_opacity     = {"u_opacity",     *this};
+    Uniform<std::array<GLfloat, 2>> u_texsize     = {"u_texsize",     *this};
+    Uniform<GLint>                  u_skewed      = {"u_skewed",      *this};
+    Uniform<GLfloat>                u_extra       = {"u_extra",       *this};
+
+protected:
+    GLint a_offset = -1;
+    GLint a_data1 = -1;
+    GLint a_data2 = -1;
 };
 
 }
diff --git a/src/mbgl/shader/line_shader.hpp b/src/mbgl/shader/line_shader.hpp
index 77866e89dc..580035a07a 100644
--- a/src/mbgl/shader/line_shader.hpp
+++ b/src/mbgl/shader/line_shader.hpp
@@ -12,17 +12,17 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    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_linewidth = {"u_linewidth", *this};
-    Uniform<float>                 u_ratio     = {"u_ratio",     *this};
-    Uniform<float>                 u_blur      = {"u_blur",      *this};
-    Uniform<float>                 u_extra     = {"u_extra",     *this};
-    UniformMatrix<2>               u_antialiasingmatrix  = {"u_antialiasingmatrix",  *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_linewidth = {"u_linewidth", *this};
+    Uniform<GLfloat>                 u_ratio     = {"u_ratio",     *this};
+    Uniform<GLfloat>                 u_blur      = {"u_blur",      *this};
+    Uniform<GLfloat>                 u_extra     = {"u_extra",     *this};
+    UniformMatrix<2>                 u_antialiasingmatrix  = {"u_antialiasingmatrix",  *this};
 
 private:
-    int32_t a_data = -1;
+    GLint a_data = -1;
 };
 
 
diff --git a/src/mbgl/shader/linepattern_shader.hpp b/src/mbgl/shader/linepattern_shader.hpp
index 335281c196..f2189d4710 100644
--- a/src/mbgl/shader/linepattern_shader.hpp
+++ b/src/mbgl/shader/linepattern_shader.hpp
@@ -12,25 +12,25 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    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_a = {"u_pattern_size_a", *this};
-    Uniform<std::array<float, 2>> u_pattern_tl_a   = {"u_pattern_tl_a",   *this};
-    Uniform<std::array<float, 2>> u_pattern_br_a   = {"u_pattern_br_a",   *this};
-    Uniform<std::array<float, 2>> u_pattern_size_b = {"u_pattern_size_b", *this};
-    Uniform<std::array<float, 2>> u_pattern_tl_b   = {"u_pattern_tl_b",   *this};
-    Uniform<std::array<float, 2>> u_pattern_br_b   = {"u_pattern_br_b",   *this};
-    Uniform<float>                u_ratio        = {"u_ratio",        *this};
-    Uniform<float>                u_point        = {"u_point",        *this};
-    Uniform<float>                u_blur         = {"u_blur",         *this};
-    Uniform<float>                u_fade         = {"u_fade",         *this};
-    Uniform<float>                u_opacity      = {"u_opacity",      *this};
-    Uniform<float>                 u_extra     = {"u_extra",     *this};
-    UniformMatrix<2>               u_antialiasingmatrix  = {"u_antialiasingmatrix",  *this};
+    UniformMatrix<4>                u_matrix         = {"u_matrix",         *this};
+    UniformMatrix<4>                u_exmatrix       = {"u_exmatrix",       *this};
+    Uniform<std::array<GLfloat, 2>> u_linewidth      = {"u_linewidth",      *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_size_a = {"u_pattern_size_a", *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_tl_a   = {"u_pattern_tl_a",   *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_br_a   = {"u_pattern_br_a",   *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_size_b = {"u_pattern_size_b", *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_tl_b   = {"u_pattern_tl_b",   *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_br_b   = {"u_pattern_br_b",   *this};
+    Uniform<GLfloat>                u_ratio          = {"u_ratio",          *this};
+    Uniform<GLfloat>                u_point          = {"u_point",          *this};
+    Uniform<GLfloat>                u_blur           = {"u_blur",           *this};
+    Uniform<GLfloat>                u_fade           = {"u_fade",           *this};
+    Uniform<GLfloat>                u_opacity        = {"u_opacity",        *this};
+    Uniform<GLfloat>                u_extra          = {"u_extra",          *this};
+    UniformMatrix<2>                u_antialiasingmatrix  = {"u_antialiasingmatrix",  *this};
 
 private:
-    int32_t a_data = -1;
+    GLint a_data = -1;
 };
 }
 
diff --git a/src/mbgl/shader/linesdf_shader.hpp b/src/mbgl/shader/linesdf_shader.hpp
index 1996d16f13..839494f79b 100644
--- a/src/mbgl/shader/linesdf_shader.hpp
+++ b/src/mbgl/shader/linesdf_shader.hpp
@@ -12,24 +12,24 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    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_linewidth = {"u_linewidth", *this};
-    Uniform<float>                 u_ratio     = {"u_ratio",     *this};
-    Uniform<float>                 u_blur      = {"u_blur",      *this};
-    Uniform<std::array<float, 2>>  u_patternscale_a = { "u_patternscale_a", *this };
-    Uniform<float>                 u_tex_y_a   = {"u_tex_y_a",     *this};
-    Uniform<std::array<float, 2>>  u_patternscale_b = { "u_patternscale_b", *this };
-    Uniform<float>                 u_tex_y_b   = {"u_tex_y_b",     *this};
-    Uniform<int32_t>               u_image     = {"u_image",     *this};
-    Uniform<float>                 u_sdfgamma  = {"u_sdfgamma",  *this};
-    Uniform<float>                 u_mix       = {"u_mix",       *this};
-    Uniform<float>                 u_extra     = {"u_extra",     *this};
-    UniformMatrix<2>               u_antialiasingmatrix  = {"u_antialiasingmatrix",  *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_linewidth = {"u_linewidth", *this};
+    Uniform<GLfloat>                 u_ratio     = {"u_ratio",     *this};
+    Uniform<GLfloat>                 u_blur      = {"u_blur",      *this};
+    Uniform<std::array<GLfloat, 2>>  u_patternscale_a = { "u_patternscale_a", *this};
+    Uniform<GLfloat>                 u_tex_y_a   = {"u_tex_y_a",   *this};
+    Uniform<std::array<GLfloat, 2>>  u_patternscale_b = { "u_patternscale_b", *this};
+    Uniform<GLfloat>                 u_tex_y_b   = {"u_tex_y_b",   *this};
+    Uniform<GLint>                   u_image     = {"u_image",     *this};
+    Uniform<GLfloat>                 u_sdfgamma  = {"u_sdfgamma",  *this};
+    Uniform<GLfloat>                 u_mix       = {"u_mix",       *this};
+    Uniform<GLfloat>                 u_extra     = {"u_extra",     *this};
+    UniformMatrix<2>                 u_antialiasingmatrix = {"u_antialiasingmatrix", *this};
 
 private:
-    int32_t a_data = -1;
+    GLint a_data = -1;
 };
 
 
diff --git a/src/mbgl/shader/outline_shader.hpp b/src/mbgl/shader/outline_shader.hpp
index 9de01e2143..2cd4b1dc31 100644
--- a/src/mbgl/shader/outline_shader.hpp
+++ b/src/mbgl/shader/outline_shader.hpp
@@ -12,9 +12,9 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    UniformMatrix<4>              u_matrix = {"u_matrix", *this};
-    Uniform<std::array<float, 4>> u_color  = {"u_color",  *this};
-    Uniform<std::array<float, 2>> u_world  = {"u_world",  *this};
+    UniformMatrix<4>                u_matrix = {"u_matrix", *this};
+    Uniform<std::array<GLfloat, 4>> u_color  = {"u_color",  *this};
+    Uniform<std::array<GLfloat, 2>> u_world  = {"u_world",  *this};
 };
 
 }
diff --git a/src/mbgl/shader/pattern_shader.hpp b/src/mbgl/shader/pattern_shader.hpp
index 28cd341d86..3dd3daa461 100644
--- a/src/mbgl/shader/pattern_shader.hpp
+++ b/src/mbgl/shader/pattern_shader.hpp
@@ -12,16 +12,16 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    UniformMatrix<4>              u_matrix        = {"u_matrix",        *this};
-    Uniform<std::array<float, 2>> u_pattern_tl_a    = {"u_pattern_tl_a",    *this};
-    Uniform<std::array<float, 2>> u_pattern_br_a    = {"u_pattern_br_a",    *this};
-    Uniform<std::array<float, 2>> u_pattern_tl_b    = {"u_pattern_tl_b",    *this};
-    Uniform<std::array<float, 2>> u_pattern_br_b    = {"u_pattern_br_b",    *this};
-    Uniform<float>                u_opacity       = {"u_opacity",       *this};
-    Uniform<float>                u_mix           = {"u_mix",           *this};
-    Uniform<int32_t>              u_image         = {"u_image",         *this};
-    UniformMatrix<3>              u_patternmatrix_a = {"u_patternmatrix_a", *this};
-    UniformMatrix<3>              u_patternmatrix_b = {"u_patternmatrix_b", *this};
+    UniformMatrix<4>                u_matrix          = {"u_matrix",          *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_tl_a    = {"u_pattern_tl_a",    *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_br_a    = {"u_pattern_br_a",    *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_tl_b    = {"u_pattern_tl_b",    *this};
+    Uniform<std::array<GLfloat, 2>> u_pattern_br_b    = {"u_pattern_br_b",    *this};
+    Uniform<GLfloat>                u_opacity         = {"u_opacity",         *this};
+    Uniform<GLfloat>                u_mix             = {"u_mix",             *this};
+    Uniform<GLint>                  u_image           = {"u_image",           *this};
+    UniformMatrix<3>                u_patternmatrix_a = {"u_patternmatrix_a", *this};
+    UniformMatrix<3>                u_patternmatrix_b = {"u_patternmatrix_b", *this};
 };
 
 }
diff --git a/src/mbgl/shader/plain_shader.hpp b/src/mbgl/shader/plain_shader.hpp
index cf2bcc38c1..ee0528e9e3 100644
--- a/src/mbgl/shader/plain_shader.hpp
+++ b/src/mbgl/shader/plain_shader.hpp
@@ -12,8 +12,8 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    UniformMatrix<4>              u_matrix   = {"u_matrix", *this};
-    Uniform<std::array<float, 4>> u_color    = {"u_color",  *this};
+    UniformMatrix<4>                u_matrix   = {"u_matrix", *this};
+    Uniform<std::array<GLfloat, 4>> u_color    = {"u_color",  *this};
 };
 
 }
diff --git a/src/mbgl/shader/raster_shader.hpp b/src/mbgl/shader/raster_shader.hpp
index 705efec996..af51b4ba46 100644
--- a/src/mbgl/shader/raster_shader.hpp
+++ b/src/mbgl/shader/raster_shader.hpp
@@ -12,15 +12,15 @@ public:
 
     void bind(GLbyte *offset) final;
 
-    UniformMatrix<4>              u_matrix            = {"u_matrix",            *this};
-    Uniform<int32_t>              u_image             = {"u_image",             *this};
-    Uniform<float>                u_opacity           = {"u_opacity",           *this};
-    Uniform<float>                u_buffer            = {"u_buffer",            *this};
-    Uniform<float>                u_brightness_low    = {"u_brightness_low",    *this};
-    Uniform<float>                u_brightness_high   = {"u_brightness_high",   *this};
-    Uniform<float>                u_saturation_factor = {"u_saturation_factor", *this};
-    Uniform<float>                u_contrast_factor   = {"u_contrast_factor",   *this};
-    Uniform<std::array<float, 3>> u_spin_weights      = {"u_spin_weights",      *this};
+    UniformMatrix<4>                u_matrix            = {"u_matrix",            *this};
+    Uniform<GLint>                  u_image             = {"u_image",             *this};
+    Uniform<GLfloat>                u_opacity           = {"u_opacity",           *this};
+    Uniform<GLfloat>                u_buffer            = {"u_buffer",            *this};
+    Uniform<GLfloat>                u_brightness_low    = {"u_brightness_low",    *this};
+    Uniform<GLfloat>                u_brightness_high   = {"u_brightness_high",   *this};
+    Uniform<GLfloat>                u_saturation_factor = {"u_saturation_factor", *this};
+    Uniform<GLfloat>                u_contrast_factor   = {"u_contrast_factor",   *this};
+    Uniform<std::array<GLfloat, 3>> u_spin_weights      = {"u_spin_weights",      *this};
 };
 
 }
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 {
diff --git a/src/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp
index dab7cd8522..1de56da87a 100644
--- a/src/mbgl/shader/shader.hpp
+++ b/src/mbgl/shader/shader.hpp
@@ -16,9 +16,9 @@ public:
 
     ~Shader();
     const GLchar *name;
-    uint32_t program;
+    GLuint program;
 
-    inline uint32_t getID() const {
+    inline GLuint getID() const {
         return program;
     }
 
diff --git a/src/mbgl/shader/uniform.cpp b/src/mbgl/shader/uniform.cpp
index c013699bfd..eca1a99d17 100644
--- a/src/mbgl/shader/uniform.cpp
+++ b/src/mbgl/shader/uniform.cpp
@@ -3,42 +3,42 @@
 namespace mbgl {
 
 template <>
-void Uniform<float>::bind(const float& t) {
+void Uniform<GLfloat>::bind(const GLfloat& t) {
     MBGL_CHECK_ERROR(glUniform1f(location, t));
 }
 
 template <>
-void Uniform<int32_t>::bind(const int32_t& t) {
+void Uniform<GLint>::bind(const GLint& t) {
     MBGL_CHECK_ERROR(glUniform1i(location, t));
 }
 
 template <>
-void Uniform<std::array<float, 2>>::bind(const std::array<float, 2>& t) {
+void Uniform<std::array<GLfloat, 2>>::bind(const std::array<GLfloat, 2>& t) {
     MBGL_CHECK_ERROR(glUniform2fv(location, 1, t.data()));
 }
 
 template <>
-void Uniform<std::array<float, 3>>::bind(const std::array<float, 3>& t) {
+void Uniform<std::array<GLfloat, 3>>::bind(const std::array<GLfloat, 3>& t) {
     MBGL_CHECK_ERROR(glUniform3fv(location, 1, t.data()));
 }
 
 template <>
-void Uniform<std::array<float, 4>>::bind(const std::array<float, 4>& t) {
+void Uniform<std::array<GLfloat, 4>>::bind(const std::array<GLfloat, 4>& t) {
     MBGL_CHECK_ERROR(glUniform4fv(location, 1, t.data()));
 }
 
 template <>
-void UniformMatrix<2>::bind(const std::array<float, 4>& t) {
+void UniformMatrix<2>::bind(const std::array<GLfloat, 4>& t) {
     MBGL_CHECK_ERROR(glUniformMatrix2fv(location, 1, GL_FALSE, t.data()));
 }
 
 template <>
-void UniformMatrix<3>::bind(const std::array<float, 9>& t) {
+void UniformMatrix<3>::bind(const std::array<GLfloat, 9>& t) {
     MBGL_CHECK_ERROR(glUniformMatrix3fv(location, 1, GL_FALSE, t.data()));
 }
 
 template <>
-void UniformMatrix<4>::bind(const std::array<float, 16>& t) {
+void UniformMatrix<4>::bind(const std::array<GLfloat, 16>& t) {
     MBGL_CHECK_ERROR(glUniformMatrix4fv(location, 1, GL_FALSE, t.data()));
 }