From c1ebece9c13ecf38c1082373c5bae838c1343c1a Mon Sep 17 00:00:00 2001 From: James0124 Date: Fri, 6 Jan 2023 06:03:27 +0900 Subject: [PATCH] Stop using illegal negative values for `wgpu::SamplerDescriptor::lod_min_clamp`. WebGPU valid usage states `lodMinClamp` must not be negative, and `lodMaxClamp` must be >= `lodMinClamp` --- code/beginner/tutorial8-depth/src/texture.rs | 2 +- code/beginner/tutorial9-models/src/texture.rs | 2 +- code/intermediate/tutorial10-lighting/src/texture.rs | 2 +- code/intermediate/tutorial11-normals/src/texture.rs | 2 +- code/intermediate/tutorial12-camera/src/texture.rs | 2 +- code/intermediate/tutorial13-terrain/src/texture.rs | 2 +- code/showcase/compute/src/texture.rs | 2 +- code/showcase/framework/src/texture.rs | 4 ++-- code/showcase/mouse-picking/src/texture.rs | 2 +- code/showcase/threading/src/texture.rs | 2 +- docs/beginner/tutorial8-depth/README.md | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/beginner/tutorial8-depth/src/texture.rs b/code/beginner/tutorial8-depth/src/texture.rs index e1006efe..e33b4a9a 100644 --- a/code/beginner/tutorial8-depth/src/texture.rs +++ b/code/beginner/tutorial8-depth/src/texture.rs @@ -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() }); diff --git a/code/beginner/tutorial9-models/src/texture.rs b/code/beginner/tutorial9-models/src/texture.rs index d80d1e64..f96dca93 100644 --- a/code/beginner/tutorial9-models/src/texture.rs +++ b/code/beginner/tutorial9-models/src/texture.rs @@ -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() }); diff --git a/code/intermediate/tutorial10-lighting/src/texture.rs b/code/intermediate/tutorial10-lighting/src/texture.rs index d80d1e64..f96dca93 100644 --- a/code/intermediate/tutorial10-lighting/src/texture.rs +++ b/code/intermediate/tutorial10-lighting/src/texture.rs @@ -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() }); diff --git a/code/intermediate/tutorial11-normals/src/texture.rs b/code/intermediate/tutorial11-normals/src/texture.rs index 906e631b..24ec29fb 100644 --- a/code/intermediate/tutorial11-normals/src/texture.rs +++ b/code/intermediate/tutorial11-normals/src/texture.rs @@ -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() }); diff --git a/code/intermediate/tutorial12-camera/src/texture.rs b/code/intermediate/tutorial12-camera/src/texture.rs index d066b4bf..086d8707 100644 --- a/code/intermediate/tutorial12-camera/src/texture.rs +++ b/code/intermediate/tutorial12-camera/src/texture.rs @@ -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() }); diff --git a/code/intermediate/tutorial13-terrain/src/texture.rs b/code/intermediate/tutorial13-terrain/src/texture.rs index 16424a26..44df967b 100644 --- a/code/intermediate/tutorial13-terrain/src/texture.rs +++ b/code/intermediate/tutorial13-terrain/src/texture.rs @@ -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() }); diff --git a/code/showcase/compute/src/texture.rs b/code/showcase/compute/src/texture.rs index 0272cc8b..f8950d96 100644 --- a/code/showcase/compute/src/texture.rs +++ b/code/showcase/compute/src/texture.rs @@ -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() }); diff --git a/code/showcase/framework/src/texture.rs b/code/showcase/framework/src/texture.rs index 0b1b7897..31889d93 100644 --- a/code/showcase/framework/src/texture.rs +++ b/code/showcase/framework/src/texture.rs @@ -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() @@ -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() diff --git a/code/showcase/mouse-picking/src/texture.rs b/code/showcase/mouse-picking/src/texture.rs index d066b4bf..086d8707 100644 --- a/code/showcase/mouse-picking/src/texture.rs +++ b/code/showcase/mouse-picking/src/texture.rs @@ -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() }); diff --git a/code/showcase/threading/src/texture.rs b/code/showcase/threading/src/texture.rs index d066b4bf..086d8707 100644 --- a/code/showcase/threading/src/texture.rs +++ b/code/showcase/threading/src/texture.rs @@ -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() }); diff --git a/docs/beginner/tutorial8-depth/README.md b/docs/beginner/tutorial8-depth/README.md index e4abca3d..a0b9d9f2 100644 --- a/docs/beginner/tutorial8-depth/README.md +++ b/docs/beginner/tutorial8-depth/README.md @@ -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() }