[core] convert remaining types to use OpenGL header defined variants

5 files changed, 8 insertions, 8 deletions

diff --git a/src/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp
index 620315d490..d54ee18c7e 100644
--- a/src/mbgl/geometry/buffer.hpp
+++ b/src/mbgl/geometry/buffer.hpp
@@ -110,10 +110,10 @@ public:
 
 private:
     // CPU buffer
-    void *array = nullptr;
+    GLvoid *array = nullptr;
 
     // Byte position where we are writing.
-    size_t pos = 0;
+    GLsizeiptr pos = 0;
 
     // Number of bytes that are valid in this buffer.
     size_t length = 0;
diff --git a/src/mbgl/geometry/glyph_atlas.hpp b/src/mbgl/geometry/glyph_atlas.hpp
index f499859d7e..c5c785994d 100644
--- a/src/mbgl/geometry/glyph_atlas.hpp
+++ b/src/mbgl/geometry/glyph_atlas.hpp
@@ -32,8 +32,8 @@ public:
     // the texture is only bound when the data is out of date (=dirty).
     void upload();
 
-    const uint16_t width = 0;
-    const uint16_t height = 0;
+    const GLsizei width;
+    const GLsizei height;
 
 private:
     struct GlyphValue {
diff --git a/src/mbgl/geometry/line_buffer.cpp b/src/mbgl/geometry/line_buffer.cpp
index f475c63b24..77a134b468 100644
--- a/src/mbgl/geometry/line_buffer.cpp
+++ b/src/mbgl/geometry/line_buffer.cpp
@@ -5,8 +5,8 @@
 
 using namespace mbgl;
 
-size_t LineVertexBuffer::add(vertex_type x, vertex_type y, float ex, float ey, int8_t tx, int8_t ty, int32_t linesofar) {
-    size_t idx = index();
+GLsizei LineVertexBuffer::add(vertex_type x, vertex_type y, float ex, float ey, int8_t tx, int8_t ty, int32_t linesofar) {
+    GLsizei idx = index();
     void *data = addElement();
 
     int16_t *coords = static_cast<int16_t *>(data);
diff --git a/src/mbgl/geometry/line_buffer.hpp b/src/mbgl/geometry/line_buffer.hpp
index 1c217b59d2..7174fa2910 100644
--- a/src/mbgl/geometry/line_buffer.hpp
+++ b/src/mbgl/geometry/line_buffer.hpp
@@ -30,7 +30,7 @@ public:
      * @param {number} tx texture normal
      * @param {number} ty texture normal
      */
-    size_t add(vertex_type x, vertex_type y, float ex, float ey, int8_t tx, int8_t ty, int32_t linesofar = 0);
+    GLsizei add(vertex_type x, vertex_type y, float ex, float ey, int8_t tx, int8_t ty, int32_t linesofar = 0);
 };
 
 
diff --git a/src/mbgl/geometry/sprite_atlas.hpp b/src/mbgl/geometry/sprite_atlas.hpp
index 4a8c3fefaf..2e794f651b 100644
--- a/src/mbgl/geometry/sprite_atlas.hpp
+++ b/src/mbgl/geometry/sprite_atlas.hpp
@@ -69,7 +69,7 @@ public:
     inline const uint32_t* getData() const { return data.get(); }
 
 private:
-    const dimension width, height;
+    const GLsizei width, height;
     const dimension pixelWidth, pixelHeight;
     const float pixelRatio;