diff --git a/Cargo.toml b/Cargo.toml index bbbdd3f..30851f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/iced-rs/cryoglyph" license = "MIT OR Apache-2.0 OR Zlib" [dependencies] -wgpu = { version = "23", default-features = false, features = ["wgsl"] } +wgpu = { version = "24", default-features = false, features = ["wgsl"] } etagere = "0.2.10" cosmic-text = "0.12" lru = { version = "0.12.1", default-features = false } @@ -15,5 +15,5 @@ rustc-hash = "2.0" [dev-dependencies] winit = "0.29" -wgpu = "23" +wgpu = "24" pollster = "0.4" diff --git a/examples/hello-world.rs b/examples/hello-world.rs index 8f3ef83..b7b5c9b 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -36,7 +36,7 @@ async fn run() { let scale_factor = window.scale_factor(); // Set up surface - let instance = Instance::new(InstanceDescriptor::default()); + let instance = Instance::new(&InstanceDescriptor::default()); let adapter = instance .request_adapter(&RequestAdapterOptions::default()) .await diff --git a/src/text_atlas.rs b/src/text_atlas.rs index 1cabbc4..5599767 100644 --- a/src/text_atlas.rs +++ b/src/text_atlas.rs @@ -6,9 +6,10 @@ use lru::LruCache; use rustc_hash::FxHasher; use std::{collections::HashSet, hash::BuildHasherDefault, sync::Arc}; use wgpu::{ - BindGroup, DepthStencilState, Device, Extent3d, ImageCopyTexture, ImageDataLayout, - MultisampleState, Origin3d, Queue, RenderPipeline, Texture, TextureAspect, TextureDescriptor, - TextureDimension, TextureFormat, TextureUsages, TextureView, TextureViewDescriptor, + BindGroup, DepthStencilState, Device, Extent3d, MultisampleState, Origin3d, Queue, + RenderPipeline, TexelCopyBufferLayout, TexelCopyTextureInfo, Texture, TextureAspect, + TextureDescriptor, TextureDimension, TextureFormat, TextureUsages, TextureView, + TextureViewDescriptor, }; type Hasher = BuildHasherDefault; @@ -163,7 +164,7 @@ impl InnerAtlas { let height = image.placement.height as usize; queue.write_texture( - ImageCopyTexture { + TexelCopyTextureInfo { texture: &self.texture, mip_level: 0, origin: Origin3d { @@ -174,7 +175,7 @@ impl InnerAtlas { aspect: TextureAspect::All, }, &image.data, - ImageDataLayout { + TexelCopyBufferLayout { offset: 0, bytes_per_row: Some(width as u32 * self.kind.num_channels() as u32), rows_per_image: None, diff --git a/src/text_render.rs b/src/text_render.rs index 163e818..94943c0 100644 --- a/src/text_render.rs +++ b/src/text_render.rs @@ -6,8 +6,8 @@ use std::{num::NonZeroU64, slice, sync::Arc}; use wgpu::util::StagingBelt; use wgpu::{ Buffer, BufferDescriptor, BufferUsages, CommandEncoder, DepthStencilState, Device, Extent3d, - ImageCopyTexture, ImageDataLayout, MultisampleState, Origin3d, Queue, RenderPass, - RenderPipeline, TextureAspect, COPY_BUFFER_ALIGNMENT, + MultisampleState, Origin3d, Queue, RenderPass, RenderPipeline, TexelCopyBufferLayout, + TexelCopyTextureInfo, TextureAspect, COPY_BUFFER_ALIGNMENT, }; /// A text renderer that uses cached glyphs to render text into an existing render pass. @@ -130,7 +130,7 @@ impl TextRenderer { let atlas_min = allocation.rectangle.min; queue.write_texture( - ImageCopyTexture { + TexelCopyTextureInfo { texture: &inner.texture, mip_level: 0, origin: Origin3d { @@ -141,7 +141,7 @@ impl TextRenderer { aspect: TextureAspect::All, }, &image.data, - ImageDataLayout { + TexelCopyBufferLayout { offset: 0, bytes_per_row: Some(width as u32 * inner.num_channels() as u32), rows_per_image: None,