summaryrefslogtreecommitdiff
path: root/src/mbgl/util
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-29 11:45:28 +0200
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-09-29 10:17:47 -0700
commitd1a84d9b51a7145f9f7665805cf71050aac7bc63 (patch)
tree057b048f24e022a2c391a1ecf736c4c9a3f10943 /src/mbgl/util
parent2b05776f978c7759824bce1c4fc89d67cc00d332 (diff)
downloadqtlocation-mapboxgl-d1a84d9b51a7145f9f7665805cf71050aac7bc63.tar.gz
[core] rename VAO => VertexArray, FBO => Framebuffer
Diffstat (limited to 'src/mbgl/util')
-rw-r--r--src/mbgl/util/offscreen_texture.cpp8
-rw-r--r--src/mbgl/util/offscreen_texture.hpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/util/offscreen_texture.cpp b/src/mbgl/util/offscreen_texture.cpp
index 602dd8092a..e396aabef6 100644
--- a/src/mbgl/util/offscreen_texture.cpp
+++ b/src/mbgl/util/offscreen_texture.cpp
@@ -14,9 +14,9 @@ void OffscreenTexture::bind(gl::Context& context,
raster.upload(context, 0);
}
- if (!fbo) {
- fbo = context.createFBO();
- context.bindFramebuffer = *fbo;
+ if (!framebuffer) {
+ framebuffer = context.createFramebuffer();
+ context.bindFramebuffer = *framebuffer;
MBGL_CHECK_ERROR(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
raster.getID(), 0));
@@ -48,7 +48,7 @@ void OffscreenTexture::bind(gl::Context& context,
}
}
} else {
- context.bindFramebuffer = *fbo;
+ context.bindFramebuffer = *framebuffer;
}
context.viewport = { { 0, 0, static_cast<GLint>(size[0]), static_cast<GLint>(size[1]) } };
diff --git a/src/mbgl/util/offscreen_texture.hpp b/src/mbgl/util/offscreen_texture.hpp
index e0a61eb4aa..2f5fa75d6c 100644
--- a/src/mbgl/util/offscreen_texture.hpp
+++ b/src/mbgl/util/offscreen_texture.hpp
@@ -16,7 +16,7 @@ public:
std::array<uint16_t, 2> getSize() const;
private:
- mbgl::optional<gl::UniqueFBO> fbo;
+ mbgl::optional<gl::UniqueFramebuffer> framebuffer;
Raster raster;
};