Changeset 671 for trunk/src/scene.cppTweet

Timestamp:

Feb 20, 2011, 1:02:48 PM (12 years ago)

Author:

sam

Message:

Fix numerous resource leaks in scene.cpp.

File:

• trunk/src/scene.cpp (modified) (2 diffs)

trunk/src/scene.cpp

@@ -90 +90 @@
      * Change the architecture to make sure of that. */
     glDeleteBuffers(data->nbufs, data->bufs);
+    free(data->bufs);
     delete data;
 }
@@ -200 +201 @@
 
 #if LOL_EXPERIMENTAL
-        GLuint vao, vbo[2], attr;
+        GLuint vao;
 
         glGenVertexArrays(1, &vao);
         glBindVertexArray(vao);
-        glGenBuffers(2, &vbo[0]);
-
-        glBindBuffer(GL_ARRAY_BUFFER, vbo[0]);
-        glBufferData(GL_ARRAY_BUFFER, 18 * (n - i) * sizeof(GLfloat), vertex, GL_STATIC_DRAW);
+#else
+        glEnableClientState(GL_VERTEX_ARRAY);
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+#endif
+
+        glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf]);
+        glBufferData(GL_ARRAY_BUFFER, 18 * (n - i) * sizeof(GLfloat),
+                     vertex, GL_STATIC_DRAW);
+#if LOL_EXPERIMENTAL
         glVertexAttribPointer(attr_pos, 3, GL_FLOAT, GL_FALSE, 0, 0);
         glEnableVertexAttribArray(attr_pos);
-
-        glBindBuffer(GL_ARRAY_BUFFER, vbo[1]);
-        glBufferData(GL_ARRAY_BUFFER, 12 * (n - i) * sizeof(GLfloat), texture, GL_STATIC_DRAW);
+#else
+        glVertexPointer(3, GL_FLOAT, 0, NULL);
+#endif
+
+        glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf + 1]);
+        glBufferData(GL_ARRAY_BUFFER, 12 * (n - i) * sizeof(GLfloat),
+                     texture, GL_STATIC_DRAW);
+#if LOL_EXPERIMENTAL
         glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, 0);
         glEnableVertexAttribArray(attr_tex);
-
+#else
+        glTexCoordPointer(2, GL_FLOAT, 0, NULL);
+#endif
+
+#if LOL_EXPERIMENTAL
         stdshader->Bind();
-#else
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-
-        glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf]);
-        glBufferData(GL_ARRAY_BUFFER, 6 * 3 * (n - i) * sizeof(float),
-                     vertex, GL_DYNAMIC_DRAW);
-        glVertexPointer(3, GL_FLOAT, 0, NULL);
-
-        glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf + 1]);
-        glBufferData(GL_ARRAY_BUFFER, 6 * 2 * (n - i) * sizeof(float),
-                     texture, GL_DYNAMIC_DRAW);
-        glTexCoordPointer(2, GL_FLOAT, 0, NULL);
 #endif