Fixed memory leak in bindless material #19041
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SarthakSingh31
changed the title
|
nice |
|
Does this also fix #18808 ? Or is this only touching materials? |
|
only materials |
alice-i-cecile
added
A-Rendering
Vrixyz
reviewed
May 16, 2025
| @@ -1129,6 +1093,14 @@ where | |||
| .expect("Texture array should exist") | |||
| .insert(binding_resource_id, texture_view); | |||
| allocated_resource_slots.insert(bindless_index, slot); | |||
|
|
|||
| if let Some(pre_existing_slot) = pre_existing_slot { | |||
| assert_eq!(*pre_existing_slot, slot); | |||
There was a problem hiding this comment.
Should these be debug_assert_eq! ?
There was a problem hiding this comment.
I think this PR makes pre_existing_slot here kinda redundant. Its just a sanity check to make sure everything is working correctly.
I can make it a debug assertion if you think that would be better.
Instead of using the pre_existing_slot ideally we want to know if a allocation has actually been made (we should get this from the insert API). The pre_existing_slot is mostly a easy way to check that.
|
seems to have been fixed by another PR already |
|
|
|
MY BAD, my test (#19311) was wrong, it still exists |
alice-i-cecile
approved these changes
May 30, 2025
alice-i-cecile
added
S-Ready-For-Final-Review
mockersf
pushed a commit
that referenced
this pull request
May 30, 2025
# Objective Fixed #19035. Fixed #18882. It consisted of two different bugs: - The allocations where being incremented even when a Data binding was created. - The ref counting on the binding was broken. ## Solution - Stopped incrementing the allocations when a data binding was created. - Rewrote the ref counting code to more reliably track the ref count. ## Testing Tested my fix for 10 minutes with the `examples/3d/animated_material.rs` example. I changed the example to spawn 51x51 meshes instead of 3x3 meshes to heighten the effects of the bug. My branch: (After 10 minutes of running the modified example) GPU: 172 MB CPU: ~700 MB Main branch: (After 2 minutes of running the modified example, my computer started to stutter so I had to end it early) GPU: 376 MB CPU: ~1300 MB
mockersf
pushed a commit
that referenced
this pull request
May 30, 2025
# Objective Fixed #19035. Fixed #18882. It consisted of two different bugs: - The allocations where being incremented even when a Data binding was created. - The ref counting on the binding was broken. ## Solution - Stopped incrementing the allocations when a data binding was created. - Rewrote the ref counting code to more reliably track the ref count. ## Testing Tested my fix for 10 minutes with the `examples/3d/animated_material.rs` example. I changed the example to spawn 51x51 meshes instead of 3x3 meshes to heighten the effects of the bug. My branch: (After 10 minutes of running the modified example) GPU: 172 MB CPU: ~700 MB Main branch: (After 2 minutes of running the modified example, my computer started to stutter so I had to end it early) GPU: 376 MB CPU: ~1300 MB
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Objective
Fixed #19035. Fixed #18882. It consisted of two different bugs:
Solution
Testing
Tested my fix for 10 minutes with the
examples/3d/animated_material.rsexample. I changed the example to spawn 51x51 meshes instead of 3x3 meshes to heighten the effects of the bug.My branch: (After 10 minutes of running the modified example)
GPU: 172 MB
CPU: ~700 MB
Main branch: (After 2 minutes of running the modified example, my computer started to stutter so I had to end it early)
GPU: 376 MB
CPU: ~1300 MB