#43 Move GL cleanup from Drop to unload

jeaye · Sep 22, 2013 · 9459fb2 · 9459fb2
1 parent 3c7b151
commit 9459fb2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/src/state/game/bsp_renderer.rs b/src/state/game/bsp_renderer.rs
@@ -113,7 +113,13 @@ impl State for BSP_Renderer
   }
 
   fn unload(&mut self)
-  { log_debug!("Unloading bsp renderer state."); }
+  {
+    log_debug!("Unloading bsp renderer state.");
+
+    /* Cleanup GL. */
+    check!(gl2::delete_vertex_arrays(&[self.vao]));
+    check!(gl2::delete_buffers(&[self.vbo]));
+  }
 
   fn get_key(&self) -> &str
   { &"bsp_renderer" }
@@ -156,13 +162,3 @@ impl State for BSP_Renderer
   { (self.game_renderer.camera as @mut ui::Input_Listener).mouse_moved(x, y) }
 }
 
-#[unsafe_destructor]
-impl Drop for BSP_Renderer
-{
-  fn drop(&mut self)
-  {
-    check!(gl2::delete_vertex_arrays(&[self.vao]));
-    check!(gl2::delete_buffers(&[self.vbo]));
-  }
-}
-
diff --git a/src/state/game/game_renderer.rs b/src/state/game/game_renderer.rs
@@ -67,6 +67,7 @@ impl State for Game_Renderer
   fn unload(&mut self)
   {
     log_debug!("Unloading game renderer state");
+
     (self.map_renderer as @mut State).unload();
   }
 

diff --git a/src/state/game/map_renderer.rs b/src/state/game/map_renderer.rs
@@ -286,6 +286,11 @@ impl State for Map_Renderer
     let (states, visible_voxels) = self.map_stream.recv();
     self.map.states = Some(states);
     self.visible_voxels = Some(visible_voxels);
+
+    /* Cleanup GL. */
+    check!(gl2::delete_vertex_arrays(&[self.vao]));
+    check!(gl2::delete_buffers(&[self.vox_vbo, self.offset_tex_vbo,
+                                 self.ibos[0], self.ibos[1]]));
   }
 
   fn get_key(&self) -> &str
@@ -353,14 +358,3 @@ impl State for Map_Renderer
   }
 }
 
-#[unsafe_destructor]
-impl Drop for Map_Renderer
-{
-  fn drop(&mut self)
-  {
-    check!(gl2::delete_vertex_arrays(&[self.vao]));
-    check!(gl2::delete_buffers(&[self.vox_vbo, self.offset_tex_vbo,
-                                 self.ibos[0], self.ibos[1]]));
-  }
-}
-