From 0d7ba1bba4dd71eb88d2cface5ce649db2413cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 19 Jul 2024 19:02:10 +0200 Subject: [PATCH] Update `wgpu` to `22.0` --- Cargo.toml | 4 ++-- examples/hello-world.rs | 3 ++- src/cache.rs | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9e70036..b5145c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/grovesNL/glyphon" license = "MIT OR Apache-2.0 OR Zlib" [dependencies] -wgpu = { version = "0.20", default-features = false, features = ["wgsl"] } +wgpu = { version = "22.0", default-features = false, features = ["wgsl"] } etagere = "0.2.10" cosmic-text = "0.12" lru = { version = "0.12.1", default-features = false } @@ -16,5 +16,5 @@ rustc-hash = "2.0" [dev-dependencies] winit = { version = "0.29.10", features = ["rwh_05"] } -wgpu = { version = "0.20", default-features = true } +wgpu = { version = "22.0", default-features = true } pollster = "0.3.0" diff --git a/examples/hello-world.rs b/examples/hello-world.rs index c977c6e..398343d 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -4,7 +4,7 @@ use glyphon::{ }; use wgpu::{ CommandEncoderDescriptor, CompositeAlphaMode, DeviceDescriptor, Features, Instance, - InstanceDescriptor, Limits, LoadOp, MultisampleState, Operations, PresentMode, + InstanceDescriptor, Limits, LoadOp, MemoryHints, MultisampleState, Operations, PresentMode, RenderPassColorAttachment, RenderPassDescriptor, RequestAdapterOptions, SurfaceConfiguration, TextureFormat, TextureUsages, TextureViewDescriptor, }; @@ -47,6 +47,7 @@ async fn run() { label: None, required_features: Features::empty(), required_limits: Limits::downlevel_defaults(), + memory_hints: MemoryHints::MemoryUsage, }, None, ) diff --git a/src/cache.rs b/src/cache.rs index b34f1a7..4c63c47 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -239,6 +239,7 @@ impl Cache { depth_stencil: depth_stencil.clone(), multisample, multiview: None, + cache: None, })); cache.push((format, multisample, depth_stencil, pipeline.clone()));