Skip to content

Commit

Permalink
Update wgpu to 0.20
Browse files Browse the repository at this point in the history
  • Loading branch information
dhardy committed May 3, 2024
1 parent 19cc240 commit 044541a
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion crates/kas-wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
2 changes: 2 additions & 0 deletions crates/kas-wgpu/src/draw/flat_round.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Vertex>() as wgpu::BufferAddress,
step_mode: wgpu::VertexStepMode::Vertex,
Expand All @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions crates/kas-wgpu/src/draw/images.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Instance>() as wgpu::BufferAddress,
step_mode: wgpu::VertexStepMode::Instance,
Expand All @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions crates/kas-wgpu/src/draw/round_2col.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Vertex>() as wgpu::BufferAddress,
step_mode: wgpu::VertexStepMode::Vertex,
Expand All @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions crates/kas-wgpu/src/draw/shaded_round.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Vertex>() as wgpu::BufferAddress,
step_mode: wgpu::VertexStepMode::Vertex,
Expand All @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions crates/kas-wgpu/src/draw/shaded_square.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Vertex>() as wgpu::BufferAddress,
step_mode: wgpu::VertexStepMode::Vertex,
Expand All @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions crates/kas-wgpu/src/draw/text_pipe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Instance>() as wgpu::BufferAddress,
step_mode: wgpu::VertexStepMode::Instance,
Expand All @@ -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),
Expand Down
2 changes: 2 additions & 0 deletions examples/mandlebrot/mandlebrot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Vertex>() as wgpu::BufferAddress,
step_mode: wgpu::VertexStepMode::Vertex,
Expand All @@ -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,
Expand Down

0 comments on commit 044541a

Please sign in to comment.