Merge pull request #299 from HellButcher/master

call `Instance::destroy_surface`
amethyst · Jan 29, 2021 · 8e3054a · 8e3054a
2 parents f15cf42 + d906ee2
commit 8e3054a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/factory/src/factory.rs b/factory/src/factory.rs
@@ -781,7 +781,13 @@ where
             self.instance.id(),
             "Resource is not owned by specified instance"
         );
-        drop(surface);
+        unsafe {
+            surface.dispose(
+                self.instance
+                    .as_instance()
+                    .expect("Cannot destroy surface without instance"),
+            );
+        }
     }
 
     /// Create target out of rendering surface.

diff --git a/wsi/src/lib.rs b/wsi/src/lib.rs
@@ -217,6 +217,16 @@ where
             usage,
         })
     }
+
+    /// Dispose of Surface.
+    ///
+    /// # Safety
+    ///
+    /// Surface must be not in use.
+    pub unsafe fn dispose(self, instance: &Instance<B>) {
+        self.assert_instance_owner(instance);
+        instance.destroy_surface(self.raw);
+    }
 }
 
 unsafe fn create_swapchain<B: Backend>(