[core] rename VAO => VertexArray, FBO => Framebuffer

2 files changed, 7 insertions, 7 deletions

diff --git a/src/mbgl/geometry/vao.cpp b/src/mbgl/geometry/vao.cpp
index 6a95127970..0f29d65cf9 100644
--- a/src/mbgl/geometry/vao.cpp
+++ b/src/mbgl/geometry/vao.cpp
@@ -19,13 +19,13 @@ void VertexArrayObject::bindVertexArrayObject(gl::Context& context) {
         return;
     }
 
-    if (!vao) {
-        vao = context.createVAO();
+    if (!vertexArray) {
+        vertexArray = context.createVertexArray();
         context.vertexBuffer.setDirty();
         context.elementBuffer.setDirty();
     }
 
-    context.vertexArrayObject = *vao;
+    context.vertexArrayObject = *vertexArray;
 }
 
 void VertexArrayObject::verifyBinding(Shader& shader, GLuint vertexBuffer, GLuint elementsBuffer,
diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp
index 2cb81481f2..a9e69c938f 100644
--- a/src/mbgl/geometry/vao.hpp
+++ b/src/mbgl/geometry/vao.hpp
@@ -24,7 +24,7 @@ public:
         if (bound_shader == 0) {
             vertexBuffer.bind(context);
             shader.bind(offset);
-            if (vao) {
+            if (vertexArray) {
                 storeBinding(shader, vertexBuffer.getID(), 0, offset);
             }
         } else {
@@ -43,7 +43,7 @@ public:
             vertexBuffer.bind(context);
             elementsBuffer.bind(context);
             shader.bind(offset);
-            if (vao) {
+            if (vertexArray) {
                 storeBinding(shader, vertexBuffer.getID(), elementsBuffer.getID(), offset);
             }
         } else {
@@ -52,7 +52,7 @@ public:
     }
 
     GLuint getID() const {
-        return *vao;
+        return *vertexArray;
     }
 
 private:
@@ -60,7 +60,7 @@ private:
     void storeBinding(Shader &shader, GLuint vertexBuffer, GLuint elementsBuffer, GLbyte *offset);
     void verifyBinding(Shader &shader, GLuint vertexBuffer, GLuint elementsBuffer, GLbyte *offset);
 
-    mbgl::optional<gl::UniqueVAO> vao;
+    mbgl::optional<gl::UniqueVertexArray> vertexArray;
 
     // For debug reasons, we're storing the bind information so that we can
     // detect errors and report