diff --git a/Cargo.toml b/Cargo.toml index 9bfb0d2..d421ca9 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 = "0.19", default-features = false, features = ["wgsl"] } etagere = "0.2.10" cosmic-text = "0.11" lru = { version = "0.12.1", default-features = false } @@ -16,5 +16,5 @@ rustc-hash = "1.1" [dev-dependencies] winit = { version = "0.29.10", features = ["rwh_05"] } -wgpu = { version = "0.20", default-features = true } +wgpu = { version = "0.19", default-features = true } pollster = "0.3.0" diff --git a/examples/hello-world.rs b/examples/hello-world.rs index 42c03e5..c400e40 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -25,13 +25,11 @@ async fn run() { // Set up window let (width, height) = (800, 600); let event_loop = EventLoop::new().unwrap(); - let window = Arc::new( - WindowBuilder::new() - .with_inner_size(LogicalSize::new(width as f64, height as f64)) - .with_title("glyphon hello world") - .build(&event_loop) - .unwrap(), - ); + let window = Arc::new(WindowBuilder::new() + .with_inner_size(LogicalSize::new(width as f64, height as f64)) + .with_title("glyphon hello world") + .build(&event_loop) + .unwrap()); let size = window.inner_size(); let scale_factor = window.scale_factor(); @@ -53,9 +51,7 @@ async fn run() { .await .unwrap(); - let surface = instance - .create_surface(window.clone()) - .expect("Create surface"); + let surface = instance.create_surface(window.clone()).expect("Create surface"); let swapchain_format = TextureFormat::Bgra8UnormSrgb; let mut config = SurfaceConfiguration { usage: TextureUsages::RENDER_ATTACHMENT, diff --git a/src/cache.rs b/src/cache.rs index b34f1a7..a73924f 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -4,10 +4,10 @@ use wgpu::{ BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutEntry, BindingResource, BindingType, BlendState, Buffer, BufferBindingType, ColorTargetState, ColorWrites, DepthStencilState, Device, FilterMode, FragmentState, MultisampleState, - PipelineCompilationOptions, PipelineLayout, PipelineLayoutDescriptor, PrimitiveState, - PrimitiveTopology, RenderPipeline, RenderPipelineDescriptor, Sampler, SamplerBindingType, - SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, - TextureFormat, TextureSampleType, TextureView, TextureViewDimension, VertexFormat, VertexState, + PipelineLayout, PipelineLayoutDescriptor, PrimitiveState, PrimitiveTopology, RenderPipeline, + RenderPipelineDescriptor, Sampler, SamplerBindingType, SamplerDescriptor, ShaderModule, + ShaderModuleDescriptor, ShaderSource, ShaderStages, TextureFormat, TextureSampleType, + TextureView, TextureViewDimension, VertexFormat, VertexState, }; use std::borrow::Cow; @@ -220,7 +220,6 @@ impl Cache { module: shader, entry_point: "vs_main", buffers: vertex_buffers, - compilation_options: PipelineCompilationOptions::default(), }, fragment: Some(FragmentState { module: shader, @@ -230,7 +229,6 @@ impl Cache { blend: Some(BlendState::ALPHA_BLENDING), write_mask: ColorWrites::default(), })], - compilation_options: PipelineCompilationOptions::default(), }), primitive: PrimitiveState { topology: PrimitiveTopology::TriangleStrip,