diff options
| author | 2024-05-23 13:29:45 +0200 | |
|---|---|---|
| committer | 2024-05-23 13:29:45 +0200 | |
| commit | d8ba6b0673a33724a177f3a1ba59705527280142 (patch) | |
| tree | 89482c8d1e3a03e00b3a8151abbb81e30ae5898c /wgpu/src/quad | |
| parent | 72ed8bcc8def9956e25f3720a3095fc96bb2eef0 (diff) | |
| parent | 468794d918eb06c1dbebb33c32b10017ad335f05 (diff) | |
| download | iced-d8ba6b0673a33724a177f3a1ba59705527280142.tar.gz iced-d8ba6b0673a33724a177f3a1ba59705527280142.tar.bz2 iced-d8ba6b0673a33724a177f3a1ba59705527280142.zip | |
Merge branch 'master' into feat/text-macro
Diffstat (limited to 'wgpu/src/quad')
| -rw-r--r-- | wgpu/src/quad/gradient.rs | 5 | ||||
| -rw-r--r-- | wgpu/src/quad/solid.rs | 5 | 
2 files changed, 6 insertions, 4 deletions
| diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs index 560fcad2..5b32c52a 100644 --- a/wgpu/src/quad/gradient.rs +++ b/wgpu/src/quad/gradient.rs @@ -46,11 +46,12 @@ impl Layer {      pub fn prepare(          &mut self,          device: &wgpu::Device, -        queue: &wgpu::Queue, +        encoder: &mut wgpu::CommandEncoder, +        belt: &mut wgpu::util::StagingBelt,          instances: &[Gradient],      ) {          let _ = self.instances.resize(device, instances.len()); -        let _ = self.instances.write(queue, 0, instances); +        let _ = self.instances.write(device, encoder, belt, 0, instances);          self.instance_count = instances.len();      } diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs index 771eee34..1cead367 100644 --- a/wgpu/src/quad/solid.rs +++ b/wgpu/src/quad/solid.rs @@ -40,11 +40,12 @@ impl Layer {      pub fn prepare(          &mut self,          device: &wgpu::Device, -        queue: &wgpu::Queue, +        encoder: &mut wgpu::CommandEncoder, +        belt: &mut wgpu::util::StagingBelt,          instances: &[Solid],      ) {          let _ = self.instances.resize(device, instances.len()); -        let _ = self.instances.write(queue, 0, instances); +        let _ = self.instances.write(device, encoder, belt, 0, instances);          self.instance_count = instances.len();      } | 
