diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-31 02:35:10 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-01 13:53:39 +0300 |
commit | 2038a21cb5d67890acafbd34bc55e365ed0043fe (patch) | |
tree | 78551ce4bd635966c1d1e22ad360731ec9da352f /src/mbgl/renderer/frame_history.cpp | |
parent | a3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (diff) | |
download | qtlocation-mapboxgl-2038a21cb5d67890acafbd34bc55e365ed0043fe.tar.gz |
[core] s/GLObjectStore/ObjectStore/
Diffstat (limited to 'src/mbgl/renderer/frame_history.cpp')
-rw-r--r-- | src/mbgl/renderer/frame_history.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/frame_history.cpp b/src/mbgl/renderer/frame_history.cpp index 09337c87a0..95d971dfde 100644 --- a/src/mbgl/renderer/frame_history.cpp +++ b/src/mbgl/renderer/frame_history.cpp @@ -57,11 +57,11 @@ bool FrameHistory::needsAnimation(const Duration& duration) const { return (time - previousTime) < duration; } -void FrameHistory::upload(gl::GLObjectStore& glObjectStore) { +void FrameHistory::upload(gl::ObjectStore& store) { if (changed) { const bool first = !texture.created(); - bind(glObjectStore); + bind(store); if (first) { MBGL_CHECK_ERROR(glTexImage2D( @@ -94,9 +94,9 @@ void FrameHistory::upload(gl::GLObjectStore& glObjectStore) { } } -void FrameHistory::bind(gl::GLObjectStore& glObjectStore) { +void FrameHistory::bind(gl::ObjectStore& store) { if (!texture.created()) { - texture.create(glObjectStore); + texture.create(store); MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, texture.getID())); #ifndef GL_ES_VERSION_2_0 MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0)); |