From ce412b3954118d2a4ae20de2d6959247d6f7ed76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Wed, 17 Jul 2024 13:01:39 +0200 Subject: [PATCH] Reapply "update to wgpu 0.20.0 (#93)" This reverts commit 0a688982e914bcd1efe4d30ac0dad0dff3c58b24. --- Cargo.toml | 4 ++-- src/cache.rs | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 785c2a3..9e70036 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.19", default-features = false, features = ["wgsl"] } +wgpu = { version = "0.20", 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.19", default-features = true } +wgpu = { version = "0.20", default-features = true } pollster = "0.3.0" diff --git a/src/cache.rs b/src/cache.rs index a73924f..b34f1a7 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, - PipelineLayout, PipelineLayoutDescriptor, PrimitiveState, PrimitiveTopology, RenderPipeline, - RenderPipelineDescriptor, Sampler, SamplerBindingType, SamplerDescriptor, ShaderModule, - ShaderModuleDescriptor, ShaderSource, ShaderStages, TextureFormat, TextureSampleType, - TextureView, TextureViewDimension, VertexFormat, VertexState, + PipelineCompilationOptions, PipelineLayout, PipelineLayoutDescriptor, PrimitiveState, + PrimitiveTopology, RenderPipeline, RenderPipelineDescriptor, Sampler, SamplerBindingType, + SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, + TextureFormat, TextureSampleType, TextureView, TextureViewDimension, VertexFormat, VertexState, }; use std::borrow::Cow; @@ -220,6 +220,7 @@ impl Cache { module: shader, entry_point: "vs_main", buffers: vertex_buffers, + compilation_options: PipelineCompilationOptions::default(), }, fragment: Some(FragmentState { module: shader, @@ -229,6 +230,7 @@ impl Cache { blend: Some(BlendState::ALPHA_BLENDING), write_mask: ColorWrites::default(), })], + compilation_options: PipelineCompilationOptions::default(), }), primitive: PrimitiveState { topology: PrimitiveTopology::TriangleStrip,