summaryrefslogtreecommitdiffstats
path: root/wgpu/src
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector@hecrj.dev>2023-10-27 03:41:16 +0200
committerLibravatar GitHub <noreply@github.com>2023-10-27 03:41:16 +0200
commit8e6f131a06e7d798c535a0a45996c62dbc1d56c0 (patch)
tree8a075bfafa53c9e15ba19f4e21434c929ffb9281 /wgpu/src
parentf1b1344d59fa7354615f560bd25ed01ad0c9f865 (diff)
parenta00ebcde3d698bc6b59a7a258e91c3612a6faaaf (diff)
downloadiced-8e6f131a06e7d798c535a0a45996c62dbc1d56c0.tar.gz
iced-8e6f131a06e7d798c535a0a45996c62dbc1d56c0.tar.bz2
iced-8e6f131a06e7d798c535a0a45996c62dbc1d56c0.zip
Merge pull request #2122 from iced-rs/update-wgpu
Update `wgpu` to `0.18` and `cosmic-text` to `0.10`
Diffstat (limited to '')
-rw-r--r--wgpu/src/backend.rs8
-rw-r--r--wgpu/src/color.rs4
-rw-r--r--wgpu/src/triangle.rs7
-rw-r--r--wgpu/src/triangle/msaa.rs4
4 files changed, 18 insertions, 5 deletions
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 65c63f19..32b8a189 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -222,10 +222,12 @@ impl Backend {
}),
None => wgpu::LoadOp::Load,
},
- store: true,
+ store: wgpu::StoreOp::Store,
},
})],
depth_stencil_attachment: None,
+ timestamp_writes: None,
+ occlusion_query_set: None,
},
));
@@ -271,11 +273,13 @@ impl Backend {
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Load,
- store: true,
+ store: wgpu::StoreOp::Store,
},
},
)],
depth_stencil_attachment: None,
+ timestamp_writes: None,
+ occlusion_query_set: None,
},
));
}
diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs
index 20827e3c..4598b0a6 100644
--- a/wgpu/src/color.rs
+++ b/wgpu/src/color.rs
@@ -143,10 +143,12 @@ pub fn convert(
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Load,
- store: true,
+ store: wgpu::StoreOp::Store,
},
})],
depth_stencil_attachment: None,
+ timestamp_writes: None,
+ occlusion_query_set: None,
});
pass.set_pipeline(&pipeline);
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 644c9f84..69270a73 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -300,10 +300,15 @@ impl Pipeline {
wgpu::RenderPassColorAttachment {
view: attachment,
resolve_target,
- ops: wgpu::Operations { load, store: true },
+ ops: wgpu::Operations {
+ load,
+ store: wgpu::StoreOp::Store,
+ },
},
)],
depth_stencil_attachment: None,
+ timestamp_writes: None,
+ occlusion_query_set: None,
});
let layer = &mut self.layers[layer];
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index 320b5b12..14abd20b 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -167,10 +167,12 @@ impl Blit {
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Load,
- store: true,
+ store: wgpu::StoreOp::Store,
},
})],
depth_stencil_attachment: None,
+ timestamp_writes: None,
+ occlusion_query_set: None,
});
render_pass.set_pipeline(&self.pipeline);