diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-29 15:32:48 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-29 10:17:47 -0700 |
commit | cc78b74098e02311cc646fe5b82c13641ff705fa (patch) | |
tree | af0219d5611f0984bf3b244a336fbc6074a44cb4 /src/mbgl/geometry/line_atlas.cpp | |
parent | 15aece8a30dcc1f1f97e28180edda46d05641a2d (diff) | |
download | qtlocation-mapboxgl-cc78b74098e02311cc646fe5b82c13641ff705fa.tar.gz |
[core] remove dependence on gl.h types
Diffstat (limited to 'src/mbgl/geometry/line_atlas.cpp')
-rw-r--r-- | src/mbgl/geometry/line_atlas.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp index 2131c43966..50e82cc015 100644 --- a/src/mbgl/geometry/line_atlas.cpp +++ b/src/mbgl/geometry/line_atlas.cpp @@ -11,10 +11,10 @@ namespace mbgl { -LineAtlas::LineAtlas(GLsizei w, GLsizei h) +LineAtlas::LineAtlas(uint16_t w, uint16_t h) : width(w), height(h), - data(std::make_unique<GLbyte[]>(w * h)), + data(std::make_unique<char[]>(w * h)), dirty(true) { } @@ -120,13 +120,13 @@ LinePatternPos LineAtlas::addDash(const std::vector<float>& dasharray, LinePatte return position; } -void LineAtlas::upload(gl::Context& context, uint32_t unit) { +void LineAtlas::upload(gl::Context& context, gl::TextureUnit unit) { if (dirty) { bind(context, unit); } } -void LineAtlas::bind(gl::Context& context, uint32_t unit) { +void LineAtlas::bind(gl::Context& context, gl::TextureUnit unit) { bool first = false; if (!texture) { texture = context.createTexture(); |