chris/cryoglyph
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reapply "update to wgpu 0.20.0 (#93)"

Browse source 
This reverts commit 0a688982e9.
This commit is contained in:
Héctor Ramón Jiménez 2024-07-17 13:01:39 +02:00
parent feef9f5630
commit ce412b3954
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -8,7 +8,7 @@ repository = "https://github.com/grovesNL/glyphon"
license = "MIT OR Apache-2.0 OR Zlib" license = "MIT OR Apache-2.0 OR Zlib"
[dependencies] [dependencies]
wgpu = { version = "0.19", default-features = false, features = ["wgsl"] } wgpu = { version = "0.20", default-features = false, features = ["wgsl"] }
etagere = "0.2.10" etagere = "0.2.10"
cosmic-text = "0.12" cosmic-text = "0.12"
lru = { version = "0.12.1", default-features = false } lru = { version = "0.12.1", default-features = false }
@ -16,5 +16,5 @@ rustc-hash = "2.0"
[dev-dependencies] [dev-dependencies]
winit = { version = "0.29.10", features = ["rwh_05"] } 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" pollster = "0.3.0"

10
src/cache.rs
View file

@ -4,10 +4,10 @@ use wgpu::{
BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutEntry, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutEntry,
BindingResource, BindingType, BlendState, Buffer, BufferBindingType, ColorTargetState, BindingResource, BindingType, BlendState, Buffer, BufferBindingType, ColorTargetState,
ColorWrites, DepthStencilState, Device, FilterMode, FragmentState, MultisampleState, ColorWrites, DepthStencilState, Device, FilterMode, FragmentState, MultisampleState,
PipelineLayout, PipelineLayoutDescriptor, PrimitiveState, PrimitiveTopology, RenderPipeline, PipelineCompilationOptions, PipelineLayout, PipelineLayoutDescriptor, PrimitiveState,
RenderPipelineDescriptor, Sampler, SamplerBindingType, SamplerDescriptor, ShaderModule, PrimitiveTopology, RenderPipeline, RenderPipelineDescriptor, Sampler, SamplerBindingType,
ShaderModuleDescriptor, ShaderSource, ShaderStages, TextureFormat, TextureSampleType, SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages,
TextureView, TextureViewDimension, VertexFormat, VertexState, TextureFormat, TextureSampleType, TextureView, TextureViewDimension, VertexFormat, VertexState,
}; };
use std::borrow::Cow; use std::borrow::Cow;
@ -220,6 +220,7 @@ impl Cache {
module: shader, module: shader,
entry_point: "vs_main", entry_point: "vs_main",
buffers: vertex_buffers, buffers: vertex_buffers,
compilation_options: PipelineCompilationOptions::default(),
}, },
fragment: Some(FragmentState { fragment: Some(FragmentState {
module: shader, module: shader,
@ -229,6 +230,7 @@ impl Cache {
blend: Some(BlendState::ALPHA_BLENDING), blend: Some(BlendState::ALPHA_BLENDING),
write_mask: ColorWrites::default(), write_mask: ColorWrites::default(),
})], })],
compilation_options: PipelineCompilationOptions::default(),
}), }),
primitive: PrimitiveState { primitive: PrimitiveState {
topology: PrimitiveTopology::TriangleStrip, topology: PrimitiveTopology::TriangleStrip,