diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-27 18:33:32 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-01 13:53:39 +0300 |
| commit | 1b0683b94c070d14bc9f2cf357e551cdbbf3043a (patch) | |
| tree | ef8557e284a9a0edb860a49ce3565b7bf622de2d /src/mbgl/geometry/line_atlas.cpp | |
| parent | 2038a21cb5d67890acafbd34bc55e365ed0043fe (diff) | |
| download | qtlocation-mapboxgl-1b0683b94c070d14bc9f2cf357e551cdbbf3043a.tar.gz | |
[core] Use unique_resource for GL objects
Source: https://github.com/okdshin/unique_resource
These replace the complexity of manually handling moveable-RAII objects
with a type specific for that purpose.
As suggested in https://github.com/mapbox/mapbox-gl-native/pull/5141#issuecomment-221719872.
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 7069b5f678..830640f780 100644 --- a/src/mbgl/geometry/line_atlas.cpp +++ b/src/mbgl/geometry/line_atlas.cpp @@ -129,16 +129,16 @@ void LineAtlas::upload(gl::ObjectStore& store) { void LineAtlas::bind(gl::ObjectStore& store) { bool first = false; - if (!texture.created()) { - texture.create(store); - MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); + if (!texture) { + texture = store.createTexture(); + MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, *texture)); MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT)); MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); first = true; } else { - MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); + MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, *texture)); } if (dirty) { |