forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ruzstd and basis universal (#8622)

Browse Source 
# Objective

- Update dependencies `ruzstd` and `basis-universal`
- Alternative to #5278 and #8133

## Solution

- Update the dependencies, fix the code
- Bevy now also depend on `syn@2` so it's not a blocker to update
`ruzstd` anymore
This commit is contained in:
François 2023-05-18 01:29:31 +02:00 committed by GitHub
parent dce472222f
commit ad8875958d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_render/Cargo.toml
View File

@ -77,9 +77,9 @@ ddsfile = { version = "0.5.0", optional = true }
ktx2 = { version = "0.3.0", optional = true } ktx2 = { version = "0.3.0", optional = true }
# For ktx2 supercompression # For ktx2 supercompression
flate2 = { version = "1.0.22", optional = true } flate2 = { version = "1.0.22", optional = true }
ruzstd = { version = "0.2.4", optional = true } ruzstd = { version = "0.3.1", optional = true }
# For transcoding of UASTC/ETC1S universal formats, and for .basis file support # For transcoding of UASTC/ETC1S universal formats, and for .basis file support
basis-universal = { version = "0.2.0", optional = true } basis-universal = { version = "0.3.0", optional = true }
encase = { version = "0.6.1", features = ["glam"] } encase = { version = "0.6.1", features = ["glam"] }
# For wgpu profiling using tracing. Use `RUST_LOG=info` to also capture the wgpu spans. # For wgpu profiling using tracing. Use `RUST_LOG=info` to also capture the wgpu spans.
profiling = { version = "1", features = ["profile-with-tracing"], optional = true } profiling = { version = "1", features = ["profile-with-tracing"], optional = true }

2
crates/bevy_render/src/texture/ktx2.rs
View File

@ -61,7 +61,7 @@ pub fn ktx2_buffer_to_image(
SupercompressionScheme::Zstandard => { SupercompressionScheme::Zstandard => {
let mut cursor = std::io::Cursor::new(_level_data); let mut cursor = std::io::Cursor::new(_level_data);
let mut decoder = ruzstd::StreamingDecoder::new(&mut cursor) let mut decoder = ruzstd::StreamingDecoder::new(&mut cursor)
.map_err(TextureError::SuperDecompressionError)?; .map_err(|err| TextureError::SuperDecompressionError(err.to_string()))?;
let mut decompressed = Vec::new(); let mut decompressed = Vec::new();
decoder.read_to_end(&mut decompressed).map_err(|err| { decoder.read_to_end(&mut decompressed).map_err(|err| {
TextureError::SuperDecompressionError(format!( TextureError::SuperDecompressionError(format!(