diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-29 11:45:28 +0200 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-29 10:17:47 -0700 |
| commit | d1a84d9b51a7145f9f7665805cf71050aac7bc63 (patch) | |
| tree | 057b048f24e022a2c391a1ecf736c4c9a3f10943 /src/mbgl/gl/value.hpp | |
| parent | 2b05776f978c7759824bce1c4fc89d67cc00d332 (diff) | |
| download | qtlocation-mapboxgl-d1a84d9b51a7145f9f7665805cf71050aac7bc63.tar.gz | |
[core] rename VAO => VertexArray, FBO => Framebuffer
Diffstat (limited to 'src/mbgl/gl/value.hpp')
| -rw-r--r-- | src/mbgl/gl/value.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/gl/value.hpp b/src/mbgl/gl/value.hpp index 6436228ed1..bfa4dce775 100644 --- a/src/mbgl/gl/value.hpp +++ b/src/mbgl/gl/value.hpp @@ -278,9 +278,9 @@ struct BindFramebuffer { MBGL_CHECK_ERROR(glBindFramebuffer(GL_FRAMEBUFFER, value)); } static Type Get() { - Type activeFBO; - MBGL_CHECK_ERROR(glGetIntegerv(GL_FRAMEBUFFER_BINDING, &activeFBO)); - return activeFBO; + Type activeFramebuffer; + MBGL_CHECK_ERROR(glGetIntegerv(GL_FRAMEBUFFER_BINDING, &activeFramebuffer)); + return activeFramebuffer; } }; @@ -366,7 +366,7 @@ struct BindBuffer { template <GLenum target> const typename BindBuffer<target>::Type BindBuffer<target>::Default; -struct BindVAO { +struct BindVertexArray { using Type = GLuint; static const constexpr Type Default = 0; static void Set(const Type& value) { |