Skip to content

Commit 11fcbc1

Browse files
sytheraxSwoorup
andauthored
chore: update naga and wgpu versions (#131)
Co-authored-by: Swoorup Joshi <swoorupj@gmail.com>
1 parent 0bd6688 commit 11fcbc1

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ prune = []
1818
allow_deprecated = []
1919

2020
[dependencies]
21-
naga = { version = "26", features = ["wgsl-in", "wgsl-out", "termcolor"] }
21+
naga = { version = "27", features = ["wgsl-in", "wgsl-out", "termcolor"] }
2222
tracing = "0.1"
2323
regex = "1.8"
2424
thiserror = "2.0"
@@ -29,6 +29,6 @@ unicode-ident = "1"
2929
indexmap = "2"
3030

3131
[dev-dependencies]
32-
wgpu = { version = "26", features = ["naga-ir"] }
32+
wgpu = { version = "27", features = ["naga-ir"] }
3333
futures-lite = "2"
3434
tracing-subscriber = { version = "0.3", features = ["std", "fmt"] }

src/compose/test.rs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,15 +1568,29 @@ mod test {
15681568

15691569
queue.submit([buffer]);
15701570

1571-
while !device.poll(wgpu::PollType::Wait).unwrap().is_queue_empty() {
1571+
while !device
1572+
.poll(wgpu::PollType::Wait {
1573+
submission_index: None,
1574+
timeout: None,
1575+
})
1576+
.unwrap()
1577+
.is_queue_empty()
1578+
{
15721579
println!("waiting...");
15731580
}
15741581

15751582
output_buffer
15761583
.slice(..)
15771584
.map_async(wgpu::MapMode::Read, |_| ());
15781585

1579-
while !device.poll(wgpu::PollType::Wait).unwrap().is_queue_empty() {
1586+
while !device
1587+
.poll(wgpu::PollType::Wait {
1588+
submission_index: None,
1589+
timeout: None,
1590+
})
1591+
.unwrap()
1592+
.is_queue_empty()
1593+
{
15801594
println!("waiting...");
15811595
}
15821596

src/compose/tests/expected/atomics.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn entry_pointX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX() -> f32 {
2222
let _e27: u32 = atomicExchange((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), _e25);
2323
let _e28: u32 = y;
2424
y = (_e28 + _e27);
25-
let _e33: _atomic_compare_exchange_resultUint4_ = atomicCompareExchangeWeak((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 12u, 0u);
25+
let _e33: _atomic_compare_exchange_result_Uint_4_ = atomicCompareExchangeWeak((&atomX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX), 12u, 0u);
2626
if _e33.exchanged {
2727
let _e36: u32 = y;
2828
y = (_e36 + _e33.old_value);

0 commit comments

Comments
 (0)