Skip to content

Commit

Permalink
rebase upstream/master
Browse files Browse the repository at this point in the history
  • Loading branch information
jinleili committed Jan 11, 2023
1 parent 2f76114 commit 5cd7541
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion wgpu-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4401,7 +4401,7 @@ impl<L> TextureDescriptor<L> {
/// dimension: wgpu::TextureDimension::D3,
/// format: wgpu::TextureFormat::Rgba8Sint,
/// usage: wgpu::TextureUsages::empty(),
/// view_formats: &[]
/// view_formats: vec![]
/// };
///
/// assert_eq!(desc.mip_level_size(0), Some(wgpu::Extent3d { width: 100, height: 60, depth_or_array_layers: 1 }));
Expand Down
1 change: 1 addition & 0 deletions wgpu/examples/stencil-triangles/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ impl framework::Example for Triangles {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Stencil8,
view_formats: &[],
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
});

Expand Down
3 changes: 3 additions & 0 deletions wgpu/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2075,6 +2075,7 @@ impl Device {
owned: true,
descriptor: TextureDescriptor {
label: None,
view_formats: &[],
..desc.clone()
},
}
Expand Down Expand Up @@ -2111,6 +2112,7 @@ impl Device {
owned: true,
descriptor: TextureDescriptor {
label: None,
view_formats: &[],
..desc.clone()
},
}
Expand Down Expand Up @@ -4108,6 +4110,7 @@ impl Surface {
mip_level_count: 1,
sample_count: 1,
dimension: TextureDimension::D2,
view_formats: &[],
};

texture_id
Expand Down

0 comments on commit 5cd7541

Please sign in to comment.