mirror of
https://github.com/gfx-rs/wgpu.git
synced 2025-12-08 21:26:17 +00:00
Another small Naga update
This commit is contained in:
parent
0070bf703c
commit
50594a747d
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -836,7 +836,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "naga"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/gfx-rs/naga?rev=8323521b838cf7a7cb4163c84f0f4ff237622f9a#8323521b838cf7a7cb4163c84f0f4ff237622f9a"
|
||||
source = "git+https://github.com/gfx-rs/naga?rev=aa35110471ee7915e1f4e1de61ea41f2f32f92c4#aa35110471ee7915e1f4e1de61ea41f2f32f92c4"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"fxhash",
|
||||
|
||||
@ -40,7 +40,7 @@ gfx-memory = "0.2"
|
||||
[dependencies.naga]
|
||||
version = "0.2"
|
||||
git = "https://github.com/gfx-rs/naga"
|
||||
rev = "8323521b838cf7a7cb4163c84f0f4ff237622f9a"
|
||||
rev = "aa35110471ee7915e1f4e1de61ea41f2f32f92c4"
|
||||
features = ["spv-in", "spv-out", "wgsl-in"]
|
||||
|
||||
[dependencies.wgt]
|
||||
|
||||
@ -125,7 +125,6 @@ fn get_aligned_type_size(
|
||||
Ti::Matrix {
|
||||
rows,
|
||||
columns,
|
||||
kind: _,
|
||||
width,
|
||||
} => {
|
||||
rows as wgt::BufferAddress * columns as wgt::BufferAddress * width as wgt::BufferAddress
|
||||
@ -410,16 +409,14 @@ fn is_sub_type(sub: &naga::TypeInner, provided: &naga::TypeInner) -> bool {
|
||||
&Ti::Matrix {
|
||||
columns: c0,
|
||||
rows: r0,
|
||||
kind: k0,
|
||||
width: w0,
|
||||
},
|
||||
&Ti::Matrix {
|
||||
columns: c1,
|
||||
rows: r1,
|
||||
kind: k1,
|
||||
width: w1,
|
||||
},
|
||||
) => c0 == c1 && r0 == r1 && k0 == k1 && w0 <= w1,
|
||||
) => c0 == c1 && r0 == r1 && w0 <= w1,
|
||||
(&Ti::Struct { members: ref m0 }, &Ti::Struct { members: ref m1 }) => m0 == m1,
|
||||
_ => false,
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user