diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-27 13:00:27 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-27 11:03:29 -0700 |
commit | ce42d22984d19fa020e6fba77e2585c0fd9dacf4 (patch) | |
tree | 76e1a33a58bfb023987de1cc7aca59e649624db3 /src/mbgl/util/offscreen_texture.cpp | |
parent | 21386b31465302d63cae5d93680442555c8560f1 (diff) | |
download | qtlocation-mapboxgl-ce42d22984d19fa020e6fba77e2585c0fd9dacf4.tar.gz |
[core] rename gl::Config to gl::Context
Diffstat (limited to 'src/mbgl/util/offscreen_texture.cpp')
-rw-r--r-- | src/mbgl/util/offscreen_texture.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/util/offscreen_texture.cpp b/src/mbgl/util/offscreen_texture.cpp index e077d60572..404aaaab67 100644 --- a/src/mbgl/util/offscreen_texture.cpp +++ b/src/mbgl/util/offscreen_texture.cpp @@ -1,4 +1,4 @@ -#include <mbgl/gl/gl_config.hpp> +#include <mbgl/gl/context.hpp> #include <mbgl/util/offscreen_texture.hpp> #include <cassert> @@ -6,18 +6,18 @@ namespace mbgl { void OffscreenTexture::bind(gl::ObjectStore& store, - gl::Config& config, + gl::Context& context, std::array<uint16_t, 2> size) { assert(size[0] > 0 && size[1] > 0); if (raster.getSize() != size) { raster.load(PremultipliedImage(size[0], size[1], nullptr)); - raster.upload(store, config, 0); + raster.upload(store, context, 0); } if (!fbo) { fbo = store.createFBO(); - config.bindFramebuffer = *fbo; + context.bindFramebuffer = *fbo; MBGL_CHECK_ERROR(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, raster.getID(), 0)); @@ -49,10 +49,10 @@ void OffscreenTexture::bind(gl::ObjectStore& store, } } } else { - config.bindFramebuffer = *fbo; + context.bindFramebuffer = *fbo; } - config.viewport = { { 0, 0, static_cast<GLint>(size[0]), static_cast<GLint>(size[1]) } }; + context.viewport = { { 0, 0, static_cast<GLint>(size[0]), static_cast<GLint>(size[1]) } }; } Raster& OffscreenTexture::getTexture() { |