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

Upgrade to wgpu 24 (#127)

Browse source
This commit is contained in:
Matheus Rangel 2025-01-18 22:59:56 -03:00 • committed by GitHub
parent 7264e5f324
commit bff018f6af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/text_atlas.rs
View file

@ -7,7 +7,7 @@ use lru::LruCache;
use rustc_hash::FxHasher;
use std::{collections::HashSet, hash::BuildHasherDefault, sync::Arc};
use wgpu::{
BindGroup, DepthStencilState, Device, Extent3d, ImageCopyTexture, ImageDataLayout,
BindGroup, DepthStencilState, Device, Extent3d, TexelCopyTextureInfo, TexelCopyBufferLayout,
MultisampleState, Origin3d, Queue, RenderPipeline, Texture, TextureAspect, TextureDescriptor,
TextureDimension, TextureFormat, TextureUsages, TextureView, TextureViewDescriptor,
};
@ -186,7 +186,7 @@ impl InnerAtlas {
};
queue.write_texture(
ImageCopyTexture {
TexelCopyTextureInfo {
texture: &self.texture,
mip_level: 0,
origin: Origin3d {
@ -197,7 +197,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,

8
src/text_render.rs
View file

@ -6,8 +6,8 @@ use crate::{
use cosmic_text::{Color, SubpixelBin};
use std::{slice, sync::Arc};
use wgpu::{
Buffer, BufferDescriptor, BufferUsages, DepthStencilState, Device, Extent3d, ImageCopyTexture,
ImageDataLayout, MultisampleState, Origin3d, Queue, RenderPass, RenderPipeline, TextureAspect,
Buffer, BufferDescriptor, BufferUsages, DepthStencilState, Device, Extent3d, TexelCopyTextureInfo,
TexelCopyBufferLayout, MultisampleState, Origin3d, Queue, RenderPass, RenderPipeline, TextureAspect,
COPY_BUFFER_ALIGNMENT,
};
@ -468,7 +468,7 @@ where
let atlas_min = allocation.rectangle.min;
queue.write_texture(
ImageCopyTexture {
TexelCopyTextureInfo {
texture: &inner.texture,
mip_level: 0,
origin: Origin3d {
@ -479,7 +479,7 @@ where
aspect: TextureAspect::All,
},
&image.data,
ImageDataLayout {
TexelCopyBufferLayout {
offset: 0,
bytes_per_row: Some(image.width as u32 * inner.num_channels() as u32),
rows_per_image: None,