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

Fix race condition when growing an image::Atlas

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-05-11 20:18:36 +02:00
parent cf434236e7
commit f02f0c01ea
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wgpu/src/image.rs
View file

@ -369,7 +369,6 @@ impl Pipeline {
layer::Image::Raster { handle, bounds } => {
if let Some(atlas_entry) = raster_cache.upload(
device,
queue,
encoder,
handle,
&mut self.texture_atlas,
@ -395,7 +394,6 @@ impl Pipeline {
if let Some(atlas_entry) = vector_cache.upload(
device,
queue,
encoder,
handle,
*color,

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

@ -65,7 +65,6 @@ impl Atlas {
pub fn upload(
&mut self,
device: &wgpu::Device,
queue: &wgpu::Queue,
encoder: &mut wgpu::CommandEncoder,
width: u32,
height: u32,
@ -75,6 +74,9 @@ impl Atlas {
let current_size = self.layers.len();
let entry = self.allocate(width, height)?;
dbg!(&entry);
dbg!(&self.layers);
// We grow the internal texture after allocating if necessary
let new_layers = self.layers.len() - current_size;
self.grow(new_layers, device, encoder);
@ -112,7 +114,8 @@ impl Atlas {
padding,
0,
allocation,
queue,
device,
encoder,
);
}
Entry::Fragmented { fragments, .. } => {
@ -127,7 +130,8 @@ impl Atlas {
padding,
offset,
&fragment.allocation,
queue,
device,
encoder,
);
}
}
@ -280,8 +284,11 @@ impl Atlas {
padding: u32,
offset: usize,
allocation: &Allocation,
queue: &wgpu::Queue,
device: &wgpu::Device,
encoder: &mut wgpu::CommandEncoder,
) {
use wgpu::util::DeviceExt;
let (x, y) = allocation.position();
let Size { width, height } = allocation.size();
let layer = allocation.layer();
@ -292,7 +299,22 @@ impl Atlas {
depth_or_array_layers: 1,
};
queue.write_texture(
let buffer =
device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("image upload buffer"),
contents: data,
usage: wgpu::BufferUsages::COPY_SRC,
});
encoder.copy_buffer_to_texture(
wgpu::ImageCopyBuffer {
buffer: &buffer,
layout: wgpu::ImageDataLayout {
offset: offset as u64,
bytes_per_row: Some(4 * image_width + padding),
rows_per_image: Some(image_height),
},
},
wgpu::ImageCopyTexture {
texture: &self.texture,
mip_level: 0,
@ -303,12 +325,6 @@ impl Atlas {
},
aspect: wgpu::TextureAspect::default(),
},
data,
wgpu::ImageDataLayout {
offset: offset as u64,
bytes_per_row: Some(4 * image_width + padding),
rows_per_image: Some(image_height),
},
extent,
);
}

4
wgpu/src/image/raster.rs
View file

@ -63,7 +63,6 @@ impl Cache {
pub fn upload(
&mut self,
device: &wgpu::Device,
queue: &wgpu::Queue,
encoder: &mut wgpu::CommandEncoder,
handle: &image::Handle,
atlas: &mut Atlas,
@ -73,8 +72,7 @@ impl Cache {
if let Memory::Host(image) = memory {
let (width, height) = image.dimensions();
let entry =
atlas.upload(device, queue, encoder, width, height, image)?;
let entry = atlas.upload(device, encoder, width, height, image)?;
*memory = Memory::Device(entry);
}

5
wgpu/src/image/vector.rs
View file

@ -74,7 +74,6 @@ impl Cache {
pub fn upload(
&mut self,
device: &wgpu::Device,
queue: &wgpu::Queue,
encoder: &mut wgpu::CommandEncoder,
handle: &svg::Handle,
color: Option<Color>,
@ -138,8 +137,8 @@ impl Cache {
});
}
let allocation = atlas
.upload(device, queue, encoder, width, height, &rgba)?;
let allocation =
atlas.upload(device, encoder, width, height, &rgba)?;
log::debug!("allocating {} {}x{}", id, width, height);