Update Rollup

.github/workflows/ci.yml

@@ -500,10 +500,10 @@ jobs:
       - name: check naga snapshots
         run: git diff --exit-code -- naga/tests/out
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always() # We want artifacts even if the tests fail.
         with:
-          name: comparison-images
+          name: comparison-images-${{ matrix.os }}
           path: |
             **/*-actual.png
             **/*-difference.png

Cargo.toml

@@ -77,13 +77,13 @@ cfg_aliases = "0.1"
 cfg-if = "1"
 codespan-reporting = "0.11"
 ctor = "0.2"
-encase = "0.6"
+encase = "0.7"
 env_logger = "0.10"
 fern = "0.6"
 flume = "0.11"
 futures-lite = "2"
 getrandom = "0.2"
-glam = "0.24.2"
+glam = "0.25"
 heck = "0.4.0"
 image = { version = "0.24", default-features = false, features = ["png"] }
 ktx2 = "0.3"

naga/Cargo.toml

@@ -53,7 +53,7 @@ rustc-hash = "1.1.0"
 indexmap = { version = "2", features = ["std"] }
 log = "0.4"
 num-traits = "0.2"
-spirv = { version = "0.2", optional = true }
+spirv = { version = "0.3", optional = true }
 thiserror = "1.0.56"
 serde = { version = "1.0.194", features = ["derive"], optional = true }
 petgraph = { version = "0.6", optional = true }
@@ -75,4 +75,4 @@ hlsl-snapshots = { version = "0.1.0", path = "./hlsl-snapshots" }
 ron = "0.8.0"
 rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" }
 serde = { version = "1.0", features = ["derive"] }
-spirv = { version = "0.2", features = ["deserialize"] }
+spirv = { version = "0.3", features = ["deserialize"] }

naga/src/front/spv/convert.rs

@@ -1,5 +1,4 @@
 use super::error::Error;
-use num_traits::cast::FromPrimitive;
 use std::convert::TryInto;
 
 pub(super) const fn map_binary_operator(word: spirv::Op) -> Result<crate::BinaryOperator, Error> {

naga/src/front/spv/mod.rs

@@ -43,7 +43,6 @@ use crate::{
     FastHashMap, FastHashSet, FastIndexMap,
 };
 
-use num_traits::cast::FromPrimitive;
 use petgraph::graphmap::GraphMap;
 use std::{convert::TryInto, mem, num::NonZeroU32, path::PathBuf};
 
@@ -661,7 +660,7 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
         if wc == 0 {
             return Err(Error::InvalidWordCount);
         }
-        let op = spirv::Op::from_u16(opcode).ok_or(Error::UnknownInstruction(opcode))?;
+        let op = spirv::Op::from_u32(opcode as u32).ok_or(Error::UnknownInstruction(opcode))?;
 
         Ok(Instruction { op, wc })
     }