Fixed a bug where skybox ddsfile would crash from wgpu #12894
Merged
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
Hexorg
force-pushed
the
fix_dds_crash
branch
3 times, most recently
from
7577733
to
eadc93c
Compare
…o read past the file buffer. Added a unit-test to prevent regression. Bumped ddsfile dependency version to 0.5.2
superdump
reviewed
Apr 6, 2024
|
|
||
| assert!(binary_offset < data.len()); | ||
| assert!(end_offset <= data.len()); | ||
| // data[binary_offset..end_offset]) |
There was a problem hiding this comment.
Not exactly. The commented line is how wgpu reads the data. I wanted to leave it here as a comment to show why the asserts are there.
superdump
reviewed
Apr 6, 2024
mockersf
reviewed
Apr 6, 2024
Improved reference code Co-authored-by: François Mockers <francois.mockers@vleue.com>
mockersf
approved these changes
Apr 6, 2024
mockersf
added
A-Rendering
alice-i-cecile
approved these changes
Apr 8, 2024
alice-i-cecile
added
the
S-Ready-For-Final-Review
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.
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 ... I made that one off of main and wasn't able to make more pull requests without making a new branch.