nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 06:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Rollup

Browse Source
This commit is contained in:
Connor Fitzgerald 2024-01-04 23:30:30 -05:00 committed by Teodor Tanasoaia
parent 0b20427601
commit 2f87a8ff83
6 changed files with 251 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -500,10 +500,10 @@ jobs:
- name: check naga snapshots - name: check naga snapshots
run: git diff --exit-code -- naga/tests/out 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. if: always() # We want artifacts even if the tests fail.
with: with:
name: comparison-images name: comparison-images-${{ matrix.os }}
path: | path: |
**/*-actual.png **/*-actual.png
**/*-difference.png **/*-difference.png

430
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

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

4
naga/Cargo.toml
View File

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

1
naga/src/front/spv/convert.rs
View File

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

3
naga/src/front/spv/mod.rs
View File

@ -43,7 +43,6 @@ use crate::{
FastHashMap, FastHashSet, FastIndexMap, FastHashMap, FastHashSet, FastIndexMap,
}; };
use num_traits::cast::FromPrimitive;
use petgraph::graphmap::GraphMap; use petgraph::graphmap::GraphMap;
use std::{convert::TryInto, mem, num::NonZeroU32, path::PathBuf}; use std::{convert::TryInto, mem, num::NonZeroU32, path::PathBuf};
@ -661,7 +660,7 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
if wc == 0 { if wc == 0 {
return Err(Error::InvalidWordCount); 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 }) Ok(Instruction { op, wc })
} }