diff --git a/Cargo.toml b/Cargo.toml index 44452ef..77cce77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/iced-rs/cryoglyph" license = "MIT OR Apache-2.0 OR Zlib" [dependencies] -wgpu = { version = "27", default-features = false, features = ["wgsl"] } +wgpu = { version = "28", default-features = false, features = ["wgsl"] } etagere = "0.2" cosmic-text = "0.16" lru = { version = "0.16", default-features = false } diff --git a/examples/hello-world.rs b/examples/hello-world.rs index 9197b0d..06106d6 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -213,6 +213,7 @@ impl winit::application::ApplicationHandler for Application { depth_stencil_attachment: None, timestamp_writes: None, occlusion_query_set: None, + multiview_mask: None, }); text_renderer.render(&atlas, &viewport, &mut pass).unwrap(); diff --git a/src/cache.rs b/src/cache.rs index 61d2e4d..f66164d 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -42,7 +42,7 @@ impl Cache { label: Some("glyphon sampler"), min_filter: FilterMode::Nearest, mag_filter: FilterMode::Nearest, - mipmap_filter: FilterMode::Nearest, + mipmap_filter: wgpu::MipmapFilterMode::Nearest, lod_min_clamp: 0f32, lod_max_clamp: 0f32, ..Default::default() @@ -139,7 +139,7 @@ impl Cache { let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor { label: None, bind_group_layouts: &[&atlas_layout, &uniforms_layout], - push_constant_ranges: &[], + immediate_size: 0, }); Self(Arc::new(Inner { @@ -237,7 +237,7 @@ impl Cache { }, depth_stencil: depth_stencil.clone(), multisample, - multiview: None, + multiview_mask: None, cache: None, }); diff --git a/src/text_render.rs b/src/text_render.rs index 8b73fe7..431a954 100644 --- a/src/text_render.rs +++ b/src/text_render.rs @@ -39,7 +39,7 @@ impl TextRenderer { let pipeline = atlas.get_or_create_pipeline(device, multisample, depth_stencil); Self { - staging_belt: StagingBelt::new(vertex_buffer_size), + staging_belt: StagingBelt::new(device.clone(), vertex_buffer_size), vertex_buffer, vertex_buffer_size, pipeline, @@ -295,7 +295,6 @@ impl TextRenderer { &self.vertex_buffer, 0, NonZeroU64::new(vertices_raw.len() as u64).expect("Non-empty vertices"), - device, ) .copy_from_slice(vertices_raw); } else { @@ -312,7 +311,7 @@ impl TextRenderer { self.vertex_buffer_size = buffer_size; self.staging_belt.finish(); - self.staging_belt = StagingBelt::new(buffer_size); + self.staging_belt = StagingBelt::new(device.clone(), buffer_size); } self.staging_belt.finish();