Fixing texture leaking due to clear view

tests/tests/mem_leaks.rs

@@ -132,6 +132,8 @@ fn draw_test_with_reports(
     let report = global_report.hub_report();
     assert_eq!(report.shader_modules.num_allocated, 1);
     assert_eq!(report.shader_modules.num_kept_from_user, 0);
+    assert_eq!(report.textures.num_allocated, 0);
+    assert_eq!(report.texture_views.num_allocated, 0);
 
     let texture = ctx.device.create_texture_with_data(
         &ctx.queue,
@@ -219,22 +221,22 @@ fn draw_test_with_reports(
 
     let global_report = ctx.instance.generate_report();
     let report = global_report.hub_report();
-    assert_eq!(report.command_buffers.num_allocated, 1);
     assert_eq!(report.command_buffers.num_kept_from_user, 1);
-    assert_eq!(report.render_pipelines.num_allocated, 1);
     assert_eq!(report.render_pipelines.num_kept_from_user, 0);
-    assert_eq!(report.pipeline_layouts.num_allocated, 1);
     assert_eq!(report.pipeline_layouts.num_kept_from_user, 0);
-    assert_eq!(report.bind_group_layouts.num_allocated, 1);
     assert_eq!(report.bind_group_layouts.num_kept_from_user, 0);
-    assert_eq!(report.bind_groups.num_allocated, 1);
     assert_eq!(report.bind_groups.num_kept_from_user, 0);
-    assert_eq!(report.texture_views.num_allocated, 2);
+    assert_eq!(report.buffers.num_kept_from_user, 0);
     assert_eq!(report.texture_views.num_kept_from_user, 0);
+    assert_eq!(report.textures.num_kept_from_user, 0);
+    assert_eq!(report.command_buffers.num_allocated, 1);
+    assert_eq!(report.render_pipelines.num_allocated, 1);
+    assert_eq!(report.pipeline_layouts.num_allocated, 1);
+    assert_eq!(report.bind_group_layouts.num_allocated, 1);
+    assert_eq!(report.bind_groups.num_allocated, 1);
     assert_eq!(report.buffers.num_allocated, 1);
-    assert_eq!(report.buffers.num_kept_from_user, 0);
+    assert_eq!(report.texture_views.num_allocated, 2);
     assert_eq!(report.textures.num_allocated, 1);
-    assert_eq!(report.textures.num_kept_from_user, 0);
 
     ctx.queue.submit(Some(encoder.finish()));
 
@@ -251,9 +253,9 @@ fn draw_test_with_reports(
     assert_eq!(report.bind_groups.num_allocated, 0);
     assert_eq!(report.bind_group_layouts.num_allocated, 0);
     assert_eq!(report.pipeline_layouts.num_allocated, 0);
-    //surface is still there
-    assert_eq!(report.texture_views.num_allocated, 1);
-    assert_eq!(report.textures.num_allocated, 1);
+    assert_eq!(report.texture_views.num_allocated, 0);
+    assert_eq!(report.textures.num_allocated, 0);
+    assert_eq!(report.buffers.num_allocated, 0);
 
     drop(ctx.queue);
     drop(ctx.device);
@@ -263,13 +265,13 @@ fn draw_test_with_reports(
     let report = global_report.hub_report();
 
     assert_eq!(report.queues.num_kept_from_user, 0);
-    assert_eq!(report.queues.num_allocated, 0);
-    //Still one texture alive because surface is not dropped till the end
-    assert_eq!(report.textures.num_allocated, 1);
-    //that is keeping still the device alive
-    assert_eq!(report.devices.num_allocated, 1);
     assert_eq!(report.textures.num_kept_from_user, 0);
     assert_eq!(report.devices.num_kept_from_user, 0);
+    assert_eq!(report.queues.num_allocated, 0);
+    assert_eq!(report.buffers.num_allocated, 0);
+    assert_eq!(report.textures.num_allocated, 0);
+    assert_eq!(report.texture_views.num_allocated, 0);
+    assert_eq!(report.devices.num_allocated, 0);
 }
 
 #[test]

wgpu-core/src/device/global.rs

@@ -735,7 +735,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
             resource::TextureClearMode::None,
         ) {
             resource::TextureClearMode::BufferCopy => SmallVec::new(),
-            resource::TextureClearMode::RenderPass { clear_views, .. } => clear_views,
+            resource::TextureClearMode::RenderPass {
+                mut clear_views, ..
+            } => clear_views.drain(..).collect(),
             resource::TextureClearMode::Surface { mut clear_view } => {
                 if let Some(view) = clear_view.take() {
                     unsafe {

wgpu-core/src/device/life.rs

@@ -328,6 +328,15 @@ impl<A: HalApi> LifetimeTracker<A> {
 
     pub fn cleanup(&mut self) {
         profiling::scope!("LifetimeTracker::cleanup");
+        self.free_resources.textures.iter().for_each(|(_, t)| {
+            if let &mut resource::TextureClearMode::RenderPass {
+                ref mut clear_views,
+                ..
+            } = &mut *t.clear_mode.write()
+            {
+                clear_views.clear();
+            }
+        });
         self.free_resources.clear();
     }
 
@@ -547,9 +556,10 @@ impl<A: HalApi> LifetimeTracker<A> {
                     .find(|a| a.index == submit_index)
                     .map_or(&mut self.free_resources, |a| &mut a.last_resources);
 
-                if let &resource::TextureClearMode::RenderPass {
-                    ref clear_views, ..
-                } = &*texture.clear_mode.read()
+                if let &mut resource::TextureClearMode::RenderPass {
+                    ref mut clear_views,
+                    ..
+                } = &mut *texture.clear_mode.write()
                 {
                     clear_views.into_iter().for_each(|v| {
                         non_referenced_resources

wgpu-core/src/device/queue.rs

@@ -1059,8 +1059,8 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
         dst.info
             .use_at(device.active_submission_index.load(Ordering::Relaxed) + 1);
 
-        let dst_raw = dst
-            .inner
+        let dst_inner = dst.inner();
+        let dst_raw = dst_inner
             .as_ref()
             .unwrap()
             .as_raw()
@@ -1083,7 +1083,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                 .textures
                 .set_single(&dst, selector, hal::TextureUses::COPY_DST)
                 .ok_or(TransferError::InvalidTexture(destination.texture))?;
-            encoder.transition_textures(transitions.map(|pending| pending.into_hal(&dst)));
+            encoder.transition_textures(
+                transitions.map(|pending| pending.into_hal(dst_inner.as_ref().unwrap())),
+            );
             encoder.copy_external_image_to_texture(
                 source,
                 dst_raw,