merge fixes (still broken)

2026-09-01 20:59:18 +02:00 · 2017-06-28 14:05:05 +02:00
parent 91864d8195
commit f01498facc
11 changed files with 95 additions and 120 deletions
--- a/openglgeometrybank.h
+++ b/openglgeometrybank.h
@@ -190,6 +190,7 @@ private:
    static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any
    static unsigned int m_activestreams;
    GLuint m_buffer { NULL }; // id of the buffer holding data on the opengl end
+	GLuint m_vao = 0;
    std::size_t m_buffercapacity{ 0 }; // total capacity of the last established buffer
    chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order