Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to wgpu 0.16.0, wgpu-hal 0.16.0 and naga 0.12.0 #8446

Merged
merged 9 commits into from
Apr 26, 2023
Merged

Updated to wgpu 0.16.0, wgpu-hal 0.16.0 and naga 0.12.0 #8446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ff4a00
Updated to wgpu 0.16.0 and wgpu-hal 0.16.0
airingursb Apr 20, 2023
7dc2d39
Updated to naga 0.12.0
airingursb Apr 20, 2023
fad0a77
Updated code format with `cargo fmt`
airingursb Apr 24, 2023
6c59137
Handle the error caused by dds during wgpu upgrade
airingursb Apr 24, 2023
626a790
Updated the code for upgrading wgpu according to the suggestion by CR
airingursb Apr 25, 2023
5cbe08e
Fix compilation error under basis-universal feature
airingursb Apr 25, 2023
bc47618
Optimize the code according to the CI prompt
airingursb Apr 25, 2023
639a09a
Replace unwrap_or_default with unwrap in order to meet error in time
airingursb Apr 25, 2023
ac12120
Merge branch 'main' into wgpu-0.16
mockersf Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace unwrap_or_default with unwrap in order to meet error in time
  • Loading branch information
@airingursb
airingursb committed Apr 25, 2023
commit 639a09a802d90ee5d935410461d72e8bacedd081
2 changes: 1 addition & 1 deletion crates/bevy_render/src/texture/image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ impl TextureFormatPixelInfo for TextureFormat {
fn pixel_size(&self) -> usize {
let info = self;
match info.block_dimensions() {
(1, 1) => info.block_size(None).unwrap_or_default() as usize,
(1, 1) => info.block_size(None).unwrap() as usize,
_ => panic!("Using pixel_size for compressed textures is invalid"),
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_render/src/texture/ktx2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ pub fn ktx2_buffer_to_image(
texture_format_info.block_dimensions().1,
);
// Texture is not a depth or stencil format, it is possible to pass `None` and unwrap
let block_bytes = texture_format_info.block_size(None).unwrap_or_default();
let block_bytes = texture_format_info.block_size(None).unwrap();

let transcoder = LowLevelUastcTranscoder::new();
for (level, level_data) in levels.iter().enumerate() {
Expand Down Expand Up @@ -240,7 +240,7 @@ pub fn ktx2_buffer_to_image(
texture_format_info.block_dimensions().1 as usize,
);
// Texture is not a depth or stencil format, it is possible to pass `None` and unwrap
let block_bytes = texture_format_info.block_size(None).unwrap_or_default() as usize;
let block_bytes = texture_format_info.block_size(None).unwrap() as usize;

let mut wgpu_data = vec![Vec::default(); (layer_count * face_count) as usize];
for (level, level_data) in levels.iter().enumerate() {
Expand Down