[core] Return to static, per-segment approach to VAOs

This is safer now -- it can be an implementation detail of Segment/Context. And the typing of SegmentVector now ensures that the attributes and program match.

1 files changed, 0 insertions, 14 deletions

diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
index 33b7a555a8..093afa20ed 100644
--- a/src/mbgl/gl/context.hpp
+++ b/src/mbgl/gl/context.hpp
@@ -233,20 +233,6 @@ private:
     std::vector<VertexArrayID> abandonedVertexArrays;
     std::vector<FramebufferID> abandonedFramebuffers;
     std::vector<RenderbufferID> abandonedRenderbuffers;
-
-    using VertexArrayObjectKey = std::tuple<
-        ProgramID,  // Program
-        BufferID,   // Vertex buffer
-        BufferID,   // Index buffer
-        std::size_t // Vertex buffer offset
-    >;
-
-    struct VertexArrayObjectHash {
-        std::size_t operator()(const VertexArrayObjectKey&) const;
-    };
-
-    using VertexArrayObjectMap = std::unordered_map<VertexArrayObjectKey, UniqueVertexArray, VertexArrayObjectHash>;
-    VertexArrayObjectMap vaos;
 };
 
 } // namespace gl