Skip to content

Commit

Permalink
Merge pull request #436 from James2022-rgb/feature/fix_illegal_lod_mi…
Browse files Browse the repository at this point in the history
…n_clamp

Stop using illegal negative values for `wgpu::SamplerDescriptor::lod_min_clamp`.
  • Loading branch information
sotrh authored Jan 14, 2023
2 parents d6460df + c1ebece commit fc21a0f
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion code/beginner/tutorial8-depth/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion code/beginner/tutorial9-models/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion code/intermediate/tutorial10-lighting/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion code/intermediate/tutorial11-normals/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion code/intermediate/tutorial12-camera/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion code/intermediate/tutorial13-terrain/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion code/showcase/compute/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
4 changes: 2 additions & 2 deletions code/showcase/framework/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl<'a> Texture<'a> {
mag_filter: wgpu::FilterMode::Linear,
min_filter: wgpu::FilterMode::Nearest,
mipmap_filter: wgpu::FilterMode::Nearest,
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
compare: Some(wgpu::CompareFunction::LessEqual),
..Default::default()
Expand Down Expand Up @@ -117,7 +117,7 @@ impl<'a> Texture<'a> {
mag_filter: wgpu::FilterMode::Linear,
min_filter: wgpu::FilterMode::Nearest,
mipmap_filter: wgpu::FilterMode::Nearest,
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
compare: Some(wgpu::CompareFunction::Always),
..Default::default()
Expand Down
2 changes: 1 addition & 1 deletion code/showcase/mouse-picking/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion code/showcase/threading/src/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual),
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
});
Expand Down
2 changes: 1 addition & 1 deletion docs/beginner/tutorial8-depth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl Texture {
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
compare: Some(wgpu::CompareFunction::LessEqual), // 5.
lod_min_clamp: -100.0,
lod_min_clamp: 0.0,
lod_max_clamp: 100.0,
..Default::default()
}
Expand Down

0 comments on commit fc21a0f

Please sign in to comment.