remove_abandoned fix

gents83 · Nov 26, 2023 · 1799b7f · 1799b7f
1 parent 12ee31d
commit 1799b7f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/wgpu-core/src/track/buffer.rs b/wgpu-core/src/track/buffer.rs
@@ -339,11 +339,11 @@ impl<A: HalApi> ResourceTracker<BufferId, Buffer<A>> for BufferTracker<A> {
                         id,
                         existing_ref_count
                     );
+                    return false;
                 }
             }
         }
-
-        false
+        true
     }
 }
 

diff --git a/wgpu-core/src/track/metadata.rs b/wgpu-core/src/track/metadata.rs
@@ -122,14 +122,7 @@ impl<A: HalApi, I: TypedId, T: Resource<I>> ResourceMetadata<A, I, T> {
     /// existing tables. See `tracker_assert_in_bounds`.
     #[inline(always)]
     pub(super) unsafe fn get_ref_count_unchecked(&self, index: usize) -> usize {
-        unsafe {
-            Arc::strong_count(
-                self.resources
-                    .get_unchecked(index)
-                    .as_ref()
-                    .unwrap_unchecked(),
-            )
-        }
+        unsafe { Arc::strong_count(self.get_resource_unchecked(index)) }
     }
 
     /// Returns an iterator over the resources owned by `self`.

diff --git a/wgpu-core/src/track/stateless.rs b/wgpu-core/src/track/stateless.rs
@@ -113,11 +113,11 @@ impl<A: HalApi, Id: TypedId, T: Resource<Id>> ResourceTracker<Id, T>
                         id,
                         existing_ref_count
                     );
+                    return false;
                 }
             }
         }
-
-        false
+        true
     }
 }
 

diff --git a/wgpu-core/src/track/texture.rs b/wgpu-core/src/track/texture.rs
@@ -428,11 +428,11 @@ impl<A: HalApi> ResourceTracker<TextureId, Texture<A>> for TextureTracker<A> {
                         id,
                         existing_ref_count
                     );
+                    return false;
                 }
             }
         }
-
-        false
+        true
     }
 }