Upgrade to wgpu 0.20

thestig4242 · May 6, 2024 · a52e9c5 · a52e9c5
1 parent 0e83bf9
commit a52e9c5
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fj-viewer/Cargo.toml b/crates/fj-viewer/Cargo.toml
@@ -33,7 +33,7 @@ default-features = false
 features = ["png", "jpeg"]
 
 [dependencies.wgpu]
-version = "0.19.4"
+version = "0.20.0"
 features = ["webgl"]
 
 # We don't depend on `getrandom` directly, but we need this to enable the `js`

diff --git a/crates/fj-viewer/src/graphics/navigation_cube.rs b/crates/fj-viewer/src/graphics/navigation_cube.rs
@@ -108,11 +108,15 @@ impl NavigationCubeRenderer {
                 vertex: wgpu::VertexState {
                     module: &shader,
                     entry_point: "vertex",
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                     buffers: &[model::ModelVertex::desc()],
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
                     entry_point: "fragment",
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: config.format,
                         blend: Some(wgpu::BlendState {

diff --git a/crates/fj-viewer/src/graphics/pipelines.rs b/crates/fj-viewer/src/graphics/pipelines.rs
@@ -76,6 +76,8 @@ impl Pipeline {
                 vertex: wgpu::VertexState {
                     module: shader.module,
                     entry_point: "vertex",
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                     buffers: &[wgpu::VertexBufferLayout {
                         array_stride: size_of::<Vertex>() as u64,
                         step_mode: wgpu::VertexStepMode::Vertex,
@@ -115,6 +117,8 @@ impl Pipeline {
                 fragment: Some(wgpu::FragmentState {
                     module: shader.module,
                     entry_point: shader.frag_entry,
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: color_format,
                         blend: Some(