me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into advanced-text

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-05-02 06:40:48 +02:00
commit 8e8808f0e1
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
12 changed files with 173 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
wgpu/src/image/atlas.rs
View file

@ -14,8 +14,6 @@ pub const SIZE: u32 = 2048;
use crate::core::Size;
use std::num::NonZeroU32;
#[derive(Debug)]
pub struct Atlas {
texture: wgpu::Texture,
@ -308,8 +306,8 @@ impl Atlas {
data,
wgpu::ImageDataLayout {
offset: offset as u64,
bytes_per_row: NonZeroU32::new(4 * image_width + padding),
rows_per_image: NonZeroU32::new(image_height),
bytes_per_row: Some(4 * image_width + padding),
rows_per_image: Some(image_height),
},
extent,
);