Fixed crash when wgpu tries to read past image data for dds skybox #12598
Conversation
This file contains 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
|
Welcome, new contributor! Please make sure you've read our contributing guide and we look forward to reviewing your pull request shortly ✨ |
alice-i-cecile
added
C-Bug
Hexorg
force-pushed
the
main
branch
2 times, most recently
from
0fceb99
to
510e35d
Compare
|
Here's a sample file that causes a crash before the fix and gets loaded correctly otherwise. bestRanar in discord mentioned I should mention ddsfile 0.5.2 - I did in the commit message. That's when number of layers started to be correct. |
mockersf
requested changes
Mar 20, 2024
There was a problem hiding this comment.
could you change the version there https://github.com/bevyengine/bevy/blob/main/crates/bevy_render/Cargo.toml#L85 to 0.5.2?
|
@mockersf done and checked to make sure it still works. |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Apr 8, 2024
Fixed a bug where skybox ddsfile would crash from wgpu while trying to read past the file buffer. Added a unit-test to prevent regression. Bumped ddsfile dependency version to 0.5.2 # Objective Prevents a crash when loading dds skybox. ## Solution ddsfile already automatically sets array layers to be 6 for skyboxes. Removed bevy's extra *= 6 multiplication. --- This is a copy of [#12598](#12598) ... I made that one off of main and wasn't able to make more pull requests without making a new branch. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
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
Fixes a crash in wgpu-0.19.3/src/util/device.rs:174:26 when it's trying to read past image data... Image is a skybox coming from a dds file.
Solution
Stop bevy from multiplying amount of layers by 6. DDS crate already reads the skybox as 6 layers.
Migration Guide
Any dds skyboxes I can make work with this fix. I'm not sure if there's a reference dds skybox somewhere.