fnmain/glyphon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to wgpu 0.20.0 (#93)

Browse source
This commit is contained in:
EggShark 2024-04-29 10:31:15 -05:00 • committed by GitHub
commit 670140e2a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 14 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.11" cosmic-text = "0.11"
lru = { version = "0.12.1", default-features = false } lru = { version = "0.12.1", default-features = false }
@ -16,5 +16,5 @@ rustc-hash = "1.1"
[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"

16
examples/hello-world.rs
View file

@ -25,11 +25,13 @@ async fn run() {
// Set up window // Set up window
let (width, height) = (800, 600); let (width, height) = (800, 600);
let event_loop = EventLoop::new().unwrap(); let event_loop = EventLoop::new().unwrap();
let window = Arc::new(WindowBuilder::new() let window = Arc::new(
.with_inner_size(LogicalSize::new(width as f64, height as f64)) WindowBuilder::new()
.with_title("glyphon hello world") .with_inner_size(LogicalSize::new(width as f64, height as f64))
.build(&event_loop) .with_title("glyphon hello world")
.unwrap()); .build(&event_loop)
.unwrap(),
);
let size = window.inner_size(); let size = window.inner_size();
let scale_factor = window.scale_factor(); let scale_factor = window.scale_factor();
@ -51,7 +53,9 @@ async fn run() {
.await .await
.unwrap(); .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 swapchain_format = TextureFormat::Bgra8UnormSrgb;
let mut config = SurfaceConfiguration { let mut config = SurfaceConfiguration {
usage: TextureUsages::RENDER_ATTACHMENT, usage: TextureUsages::RENDER_ATTACHMENT,

14
src/text_atlas.rs
View file

@ -13,12 +13,12 @@ use wgpu::{
BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutEntry, BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutEntry,
BindingResource, BindingType, BlendState, BufferBindingType, ColorTargetState, ColorWrites, BindingResource, BindingType, BlendState, BufferBindingType, ColorTargetState, ColorWrites,
DepthStencilState, Device, Extent3d, FilterMode, FragmentState, ImageCopyTexture, DepthStencilState, Device, Extent3d, FilterMode, FragmentState, ImageCopyTexture,
ImageDataLayout, MultisampleState, Origin3d, PipelineLayout, PipelineLayoutDescriptor, ImageDataLayout, MultisampleState, Origin3d, PipelineCompilationOptions, PipelineLayout,
PrimitiveState, Queue, RenderPipeline, RenderPipelineDescriptor, Sampler, SamplerBindingType, PipelineLayoutDescriptor, PrimitiveState, Queue, RenderPipeline, RenderPipelineDescriptor,
SamplerDescriptor, ShaderModule, ShaderModuleDescriptor, ShaderSource, ShaderStages, Texture, Sampler, SamplerBindingType, SamplerDescriptor, ShaderModule, ShaderModuleDescriptor,
TextureAspect, TextureDescriptor, TextureDimension, TextureFormat, TextureSampleType, ShaderSource, ShaderStages, Texture, TextureAspect, TextureDescriptor, TextureDimension,
TextureUsages, TextureView, TextureViewDescriptor, TextureViewDimension, VertexFormat, TextureFormat, TextureSampleType, TextureUsages, TextureView, TextureViewDescriptor,
VertexState, TextureViewDimension, VertexFormat, VertexState,
}; };
type Hasher = BuildHasherDefault<FxHasher>; type Hasher = BuildHasherDefault<FxHasher>;
@ -502,6 +502,7 @@ impl TextAtlas {
module: &self.shader, module: &self.shader,
entry_point: "vs_main", entry_point: "vs_main",
buffers: &self.vertex_buffers, buffers: &self.vertex_buffers,
compilation_options: PipelineCompilationOptions::default(),
}, },
fragment: Some(FragmentState { fragment: Some(FragmentState {
module: &self.shader, module: &self.shader,
@ -511,6 +512,7 @@ impl TextAtlas {
blend: Some(BlendState::ALPHA_BLENDING), blend: Some(BlendState::ALPHA_BLENDING),
write_mask: ColorWrites::default(), write_mask: ColorWrites::default(),
})], })],
compilation_options: PipelineCompilationOptions::default(),
}), }),
primitive: PrimitiveState::default(), primitive: PrimitiveState::default(),
depth_stencil: depth_stencil.clone(), depth_stencil: depth_stencil.clone(),