From 044541a5f547a31960d7c9f11026c421ca7cb548 Mon Sep 17 00:00:00 2001 From: Diggory Hardy Date: Thu, 2 May 2024 10:10:17 +0100 Subject: [PATCH] Update wgpu to 0.20 --- crates/kas-wgpu/Cargo.toml | 2 +- crates/kas-wgpu/src/draw/flat_round.rs | 2 ++ crates/kas-wgpu/src/draw/images.rs | 2 ++ crates/kas-wgpu/src/draw/round_2col.rs | 2 ++ crates/kas-wgpu/src/draw/shaded_round.rs | 2 ++ crates/kas-wgpu/src/draw/shaded_square.rs | 2 ++ crates/kas-wgpu/src/draw/text_pipe.rs | 2 ++ examples/mandlebrot/mandlebrot.rs | 2 ++ 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/crates/kas-wgpu/Cargo.toml b/crates/kas-wgpu/Cargo.toml index f720ed343..1570d17dc 100644 --- a/crates/kas-wgpu/Cargo.toml +++ b/crates/kas-wgpu/Cargo.toml @@ -47,7 +47,7 @@ path = "../kas-core" version = "0.6.0" [dependencies.wgpu] -version = "0.19.1" +version = "0.20.0" default-features = false features = ["spirv"] diff --git a/crates/kas-wgpu/src/draw/flat_round.rs b/crates/kas-wgpu/src/draw/flat_round.rs index d2af8c6af..16f9c511d 100644 --- a/crates/kas-wgpu/src/draw/flat_round.rs +++ b/crates/kas-wgpu/src/draw/flat_round.rs @@ -68,6 +68,7 @@ impl Pipeline { vertex: wgpu::VertexState { module: &shaders.vert_flat_round, entry_point: "main", + compilation_options: Default::default(), buffers: &[wgpu::VertexBufferLayout { array_stride: size_of::() as wgpu::BufferAddress, step_mode: wgpu::VertexStepMode::Vertex, @@ -94,6 +95,7 @@ impl Pipeline { fragment: Some(wgpu::FragmentState { module: &shaders.frag_flat_round, entry_point: "main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format: super::RENDER_TEX_FORMAT, blend: Some(wgpu::BlendState::ALPHA_BLENDING), diff --git a/crates/kas-wgpu/src/draw/images.rs b/crates/kas-wgpu/src/draw/images.rs index e38b803d6..7364cd627 100644 --- a/crates/kas-wgpu/src/draw/images.rs +++ b/crates/kas-wgpu/src/draw/images.rs @@ -95,6 +95,7 @@ impl Images { wgpu::VertexState { module: &shaders.vert_image, entry_point: "main", + compilation_options: Default::default(), buffers: &[wgpu::VertexBufferLayout { array_stride: size_of::() as wgpu::BufferAddress, step_mode: wgpu::VertexStepMode::Instance, @@ -109,6 +110,7 @@ impl Images { wgpu::FragmentState { module: &shaders.frag_image, entry_point: "main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format: super::RENDER_TEX_FORMAT, blend: Some(wgpu::BlendState::ALPHA_BLENDING), diff --git a/crates/kas-wgpu/src/draw/round_2col.rs b/crates/kas-wgpu/src/draw/round_2col.rs index faa3cae18..f9d5a38ea 100644 --- a/crates/kas-wgpu/src/draw/round_2col.rs +++ b/crates/kas-wgpu/src/draw/round_2col.rs @@ -57,6 +57,7 @@ impl Pipeline { vertex: wgpu::VertexState { module: &shaders.vert_round_2col, entry_point: "main", + compilation_options: Default::default(), buffers: &[wgpu::VertexBufferLayout { array_stride: size_of::() as wgpu::BufferAddress, step_mode: wgpu::VertexStepMode::Vertex, @@ -82,6 +83,7 @@ impl Pipeline { fragment: Some(wgpu::FragmentState { module: &shaders.frag_round_2col, entry_point: "main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format: super::RENDER_TEX_FORMAT, blend: Some(wgpu::BlendState::ALPHA_BLENDING), diff --git a/crates/kas-wgpu/src/draw/shaded_round.rs b/crates/kas-wgpu/src/draw/shaded_round.rs index 8792bc3c2..b76776b1b 100644 --- a/crates/kas-wgpu/src/draw/shaded_round.rs +++ b/crates/kas-wgpu/src/draw/shaded_round.rs @@ -63,6 +63,7 @@ impl Pipeline { vertex: wgpu::VertexState { module: &shaders.vert_shaded_round, entry_point: "main", + compilation_options: Default::default(), buffers: &[wgpu::VertexBufferLayout { array_stride: size_of::() as wgpu::BufferAddress, step_mode: wgpu::VertexStepMode::Vertex, @@ -89,6 +90,7 @@ impl Pipeline { fragment: Some(wgpu::FragmentState { module: &shaders.frag_shaded_round, entry_point: "main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format: super::RENDER_TEX_FORMAT, blend: Some(wgpu::BlendState::ALPHA_BLENDING), diff --git a/crates/kas-wgpu/src/draw/shaded_square.rs b/crates/kas-wgpu/src/draw/shaded_square.rs index 3e6019b6f..a9bac5c33 100644 --- a/crates/kas-wgpu/src/draw/shaded_square.rs +++ b/crates/kas-wgpu/src/draw/shaded_square.rs @@ -50,6 +50,7 @@ impl Pipeline { vertex: wgpu::VertexState { module: &shaders.vert_shaded_square, entry_point: "main", + compilation_options: Default::default(), buffers: &[wgpu::VertexBufferLayout { array_stride: size_of::() as wgpu::BufferAddress, step_mode: wgpu::VertexStepMode::Vertex, @@ -74,6 +75,7 @@ impl Pipeline { fragment: Some(wgpu::FragmentState { module: &shaders.frag_shaded_square, entry_point: "main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format: super::RENDER_TEX_FORMAT, blend: Some(wgpu::BlendState::ALPHA_BLENDING), diff --git a/crates/kas-wgpu/src/draw/text_pipe.rs b/crates/kas-wgpu/src/draw/text_pipe.rs index ad8ada6e7..a31efcdb4 100644 --- a/crates/kas-wgpu/src/draw/text_pipe.rs +++ b/crates/kas-wgpu/src/draw/text_pipe.rs @@ -96,6 +96,7 @@ impl Pipeline { wgpu::VertexState { module: &shaders.vert_glyph, entry_point: "main", + compilation_options: Default::default(), buffers: &[wgpu::VertexBufferLayout { array_stride: size_of::() as wgpu::BufferAddress, step_mode: wgpu::VertexStepMode::Instance, @@ -111,6 +112,7 @@ impl Pipeline { wgpu::FragmentState { module: &shaders.frag_glyph, entry_point: "main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format: super::RENDER_TEX_FORMAT, blend: Some(wgpu::BlendState::ALPHA_BLENDING), diff --git a/examples/mandlebrot/mandlebrot.rs b/examples/mandlebrot/mandlebrot.rs index 457f50f44..1cc49af83 100644 --- a/examples/mandlebrot/mandlebrot.rs +++ b/examples/mandlebrot/mandlebrot.rs @@ -132,6 +132,7 @@ impl CustomPipeBuilder for PipeBuilder { vertex: wgpu::VertexState { module: &shaders.vertex, entry_point: "main", + compilation_options: Default::default(), buffers: &[wgpu::VertexBufferLayout { array_stride: size_of::() as wgpu::BufferAddress, step_mode: wgpu::VertexStepMode::Vertex, @@ -152,6 +153,7 @@ impl CustomPipeBuilder for PipeBuilder { fragment: Some(wgpu::FragmentState { module: &shaders.fragment, entry_point: "main", + compilation_options: Default::default(), targets: &[Some(wgpu::ColorTargetState { format: tex_format, blend: None,