Skip to content

Commit

Permalink
Merge pull request #94 from terrarier2111/master
Browse files Browse the repository at this point in the history
Update wgpu and winit
  • Loading branch information
hecrj authored Nov 1, 2022
2 parents 8cc7df6 + 654f21d commit d946469
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ readme = "README.md"
resolver = "2"

[dependencies]
wgpu = "0.13"
wgpu = "0.14"
glyph_brush = "0.7"
log = "0.4"

Expand All @@ -22,5 +22,5 @@ features = ["derive"]

[dev-dependencies]
env_logger = "0.9"
winit = "0.26"
winit = "0.27"
futures = "0.3"
3 changes: 3 additions & 0 deletions examples/clipping.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::error::Error;
use wgpu::CompositeAlphaMode;
use wgpu_glyph::{ab_glyph, GlyphBrushBuilder, Region, Section, Text};

fn main() -> Result<(), Box<dyn Error>> {
Expand Down Expand Up @@ -47,6 +48,7 @@ fn main() -> Result<(), Box<dyn Error>> {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto
},
);

Expand Down Expand Up @@ -81,6 +83,7 @@ fn main() -> Result<(), Box<dyn Error>> {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto
},
);
}
Expand Down
2 changes: 2 additions & 0 deletions examples/depth.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::error::Error;
use wgpu::CompositeAlphaMode;
use wgpu_glyph::{ab_glyph, GlyphBrushBuilder, Section, Text};

const FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Bgra8UnormSrgb;
Expand Down Expand Up @@ -202,6 +203,7 @@ fn create_frame_views(
width,
height,
present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto
},
);

Expand Down
3 changes: 3 additions & 0 deletions examples/hello.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::error::Error;
use wgpu::CompositeAlphaMode;
use wgpu_glyph::{ab_glyph, GlyphBrushBuilder, Section, Text};

fn main() -> Result<(), Box<dyn Error>> {
Expand Down Expand Up @@ -47,6 +48,7 @@ fn main() -> Result<(), Box<dyn Error>> {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto
},
);

Expand Down Expand Up @@ -81,6 +83,7 @@ fn main() -> Result<(), Box<dyn Error>> {
width: size.width,
height: size.height,
present_mode: wgpu::PresentMode::AutoVsync,
alpha_mode: CompositeAlphaMode::Auto
},
);
}
Expand Down

0 comments on commit d946469

Please sign in to comment.