Skip to content

Update rspirv version #7945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2025
Merged

Update rspirv version #7945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04e0144
Update rspirv version
inner-daemons Jul 14, 2025
1250fee
Updated naga snapshots
inner-daemons Jul 14, 2025
0575a7c
Merge branch 'trunk' into update-rspirv-version
inner-daemons Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ rwh_05 = { version = "0.5.2", package = "raw-window-handle" } # temporary compat
rayon = "1.3"
regex-lite = "0.1"
renderdoc-sys = "1"
rspirv = { version = "0.11", git = "https://github.com/gfx-rs/rspirv", rev = "b969f175d5663258b4891e44b76c1544da9661ab" }
rspirv = "0.12"
ron = "0.10"
# NOTE: rustc-hash v2 is a completely different hasher with different performance characteristics
# see discussion here (including with some other alternatives): https://github.com/gfx-rs/wgpu/issues/6999
Expand Down
4 changes: 2 additions & 2 deletions naga/tests/out/spv/wgsl-6438-conflicting-idents.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ OpDecorate %32 Location 0
%14 = OpTypePointer Output %5
%13 = OpVariable %14 Output
%16 = OpTypeFunction %2
%17 = OpConstant %4 0.0
%18 = OpConstant %4 1.0
%17 = OpConstant %4 0
%18 = OpConstant %4 1
%20 = OpTypePointer Function %6
%21 = OpConstantNull %6
%23 = OpTypePointer Function %3
Expand Down
2 changes: 1 addition & 1 deletion naga/tests/out/spv/wgsl-7048-multiple-dynamic-1.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ OpDecorate %5 ArrayStride 16
%9 = OpTypeInt 32 1
%12 = OpTypeFunction %2
%13 = OpConstantNull %5
%14 = OpConstant %4 0.0
%14 = OpConstant %4 0
%15 = OpConstantComposite %8 %14 %14 %14 %14
%16 = OpConstant %9 0
%18 = OpTypePointer Function %8
Expand Down
2 changes: 1 addition & 1 deletion naga/tests/out/spv/wgsl-7048-multiple-dynamic-2.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OpDecorate %11 Location 0
%12 = OpTypePointer Output %3
%11 = OpVariable %12 Output
%14 = OpTypeFunction %2
%15 = OpConstant %4 0.0
%15 = OpConstant %4 0
%16 = OpConstantComposite %5 %15 %15
%17 = OpConstantComposite %6 %16 %16
%18 = OpConstant %9 0
Expand Down
2 changes: 1 addition & 1 deletion naga/tests/out/spv/wgsl-7048-multiple-dynamic-3.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OpDecorate %6 ArrayStride 16
%13 = OpTypeFunction %5 %6 %8
%14 = OpConstant %8 0
%15 = OpConstant %8 1
%16 = OpConstant %3 0.0
%16 = OpConstant %3 0
%17 = OpConstantComposite %4 %16 %16 %16
%18 = OpConstantComposite %5 %16 %17
%20 = OpTypePointer Function %8
Expand Down
2 changes: 1 addition & 1 deletion naga/tests/out/spv/wgsl-abstract-types-builtins.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ OpExecutionMode %6 LocalSize 1 1 1
%4 = OpTypeFloat 32
%7 = OpTypeFunction %2
%8 = OpConstant %3 1
%9 = OpConstant %4 1.0
%9 = OpConstant %4 1
%11 = OpTypePointer Function %3
%13 = OpTypePointer Function %4
%6 = OpFunction %2 None %7
Expand Down
18 changes: 9 additions & 9 deletions naga/tests/out/spv/wgsl-abstract-types-const.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ OpMemberDecorate %14 2 Offset 8
%19 = OpConstant %5 44
%20 = OpConstant %5 45
%21 = OpConstantComposite %6 %19 %20
%22 = OpConstant %7 46.0
%23 = OpConstant %7 47.0
%22 = OpConstant %7 46
%23 = OpConstant %7 47
%24 = OpConstantComposite %8 %22 %23
%25 = OpConstant %7 48.0
%26 = OpConstant %7 49.0
%25 = OpConstant %7 48
%26 = OpConstant %7 49
%27 = OpConstantComposite %8 %25 %26
%28 = OpConstant %5 42
%29 = OpConstant %5 43
Expand All @@ -45,14 +45,14 @@ OpMemberDecorate %14 2 Offset 8
%32 = OpConstantComposite %4 %31 %31
%33 = OpConstant %5 0
%34 = OpConstantComposite %6 %33 %33
%35 = OpConstant %7 0.0
%35 = OpConstant %7 0
%36 = OpConstantComposite %8 %35 %35
%37 = OpConstantComposite %9 %36 %36
%38 = OpConstant %7 1.0
%39 = OpConstant %7 2.0
%38 = OpConstant %7 1
%39 = OpConstant %7 2
%40 = OpConstantComposite %8 %38 %39
%41 = OpConstant %7 3.0
%42 = OpConstant %7 4.0
%41 = OpConstant %7 3
%42 = OpConstant %7 4
%43 = OpConstantComposite %8 %41 %42
%44 = OpConstantComposite %9 %40 %43
%45 = OpConstant %3 1
Expand Down
2 changes: 1 addition & 1 deletion naga/tests/out/spv/wgsl-abstract-types-function-calls.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ OpDecorate %13 ArrayStride 4
%62 = OpTypeFunction %2 %13
%68 = OpTypeFunction %2 %3 %4
%72 = OpTypeFunction %2
%73 = OpConstant %3 0.0
%73 = OpConstant %3 0
%74 = OpConstant %4 0
%75 = OpConstant %5 0
%76 = OpConstantComposite %6 %73 %73
Expand Down
18 changes: 9 additions & 9 deletions naga/tests/out/spv/wgsl-abstract-types-let.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ OpDecorate %17 ArrayStride 16
%24 = OpConstant %5 44
%25 = OpConstant %5 45
%26 = OpConstantComposite %6 %24 %25
%27 = OpConstant %7 46.0
%28 = OpConstant %7 47.0
%27 = OpConstant %7 46
%28 = OpConstant %7 47
%29 = OpConstantComposite %8 %27 %28
%30 = OpConstant %7 48.0
%31 = OpConstant %7 49.0
%30 = OpConstant %7 48
%31 = OpConstant %7 49
%32 = OpConstantComposite %8 %30 %31
%33 = OpConstant %5 42
%34 = OpConstant %5 43
Expand All @@ -47,14 +47,14 @@ OpDecorate %17 ArrayStride 16
%37 = OpConstantComposite %4 %36 %36
%38 = OpConstant %5 0
%39 = OpConstantComposite %6 %38 %38
%40 = OpConstant %7 0.0
%40 = OpConstant %7 0
%41 = OpConstantComposite %8 %40 %40
%42 = OpConstantComposite %9 %41 %41
%43 = OpConstant %7 1.0
%44 = OpConstant %7 2.0
%43 = OpConstant %7 1
%44 = OpConstant %7 2
%45 = OpConstantComposite %8 %43 %44
%46 = OpConstant %7 3.0
%47 = OpConstant %7 4.0
%46 = OpConstant %7 3
%47 = OpConstant %7 4
%48 = OpConstantComposite %8 %46 %47
%49 = OpConstantComposite %9 %45 %48
%50 = OpConstant %3 1
Expand Down
14 changes: 7 additions & 7 deletions naga/tests/out/spv/wgsl-abstract-types-operators.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ OpDecorate %116 BuiltIn LocalInvocationId
%5 = OpTypeInt 32 0
%7 = OpConstant %5 64
%6 = OpTypeArray %5 %7
%8 = OpConstant %3 3.0
%8 = OpConstant %3 3
%9 = OpConstant %4 3
%10 = OpConstant %5 3
%11 = OpConstant %5 0
%12 = OpConstant %4 -2147483648
%13 = OpConstant %3 -3.4028235e38
%13 = OpConstant %3 -340282350000000000000000000000000000000
%14 = OpConstant %4 4
%15 = OpConstant %5 4
%16 = OpConstant %4 0
%18 = OpTypePointer Workgroup %6
%17 = OpVariable %18 Workgroup
%21 = OpTypeFunction %2
%22 = OpConstant %3 42.0
%22 = OpConstant %3 42
%23 = OpConstant %4 43
%24 = OpConstant %5 44
%25 = OpConstant %3 1.0
%26 = OpConstant %3 2.0
%25 = OpConstant %3 1
%26 = OpConstant %3 2
%27 = OpConstant %4 1
%28 = OpConstant %4 2
%29 = OpConstant %5 1
Expand All @@ -52,8 +52,8 @@ OpDecorate %116 BuiltIn LocalInvocationId
%64 = OpConstantNull %5
%66 = OpConstantNull %4
%68 = OpConstantNull %4
%101 = OpConstant %3 5.0
%102 = OpConstant %3 7.0
%101 = OpConstant %3 5
%102 = OpConstant %3 7
%108 = OpTypePointer Workgroup %5
%114 = OpConstantNull %6
%115 = OpTypeVector %5 3
Expand Down
2 changes: 1 addition & 1 deletion naga/tests/out/spv/wgsl-abstract-types-return.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OpDecorate %7 ArrayStride 4
%16 = OpTypeFunction %4
%17 = OpConstant %4 1
%21 = OpTypeFunction %5
%22 = OpConstant %5 1.0
%22 = OpConstant %5 1
%29 = OpTypeFunction %6
%30 = OpConstantComposite %6 %22 %22
%34 = OpTypeFunction %7
Expand Down
18 changes: 9 additions & 9 deletions naga/tests/out/spv/wgsl-abstract-types-var.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ OpDecorate %18 ArrayStride 16
%22 = OpConstant %5 44
%23 = OpConstant %5 45
%24 = OpConstantComposite %6 %22 %23
%25 = OpConstant %7 46.0
%26 = OpConstant %7 47.0
%25 = OpConstant %7 46
%26 = OpConstant %7 47
%27 = OpConstantComposite %8 %25 %26
%28 = OpConstant %7 48.0
%29 = OpConstant %7 49.0
%28 = OpConstant %7 48
%29 = OpConstant %7 49
%30 = OpConstantComposite %8 %28 %29
%31 = OpConstant %5 42
%32 = OpConstant %5 43
Expand All @@ -48,14 +48,14 @@ OpDecorate %18 ArrayStride 16
%35 = OpConstantComposite %4 %34 %34
%36 = OpConstant %5 0
%37 = OpConstantComposite %6 %36 %36
%38 = OpConstant %7 0.0
%38 = OpConstant %7 0
%39 = OpConstantComposite %8 %38 %38
%40 = OpConstantComposite %9 %39 %39
%41 = OpConstant %7 1.0
%42 = OpConstant %7 2.0
%41 = OpConstant %7 1
%42 = OpConstant %7 2
%43 = OpConstantComposite %8 %41 %42
%44 = OpConstant %7 3.0
%45 = OpConstant %7 4.0
%44 = OpConstant %7 3
%45 = OpConstant %7 4
%46 = OpConstantComposite %8 %44 %45
%47 = OpConstantComposite %9 %43 %46
%48 = OpConstant %3 1
Expand Down
34 changes: 17 additions & 17 deletions naga/tests/out/spv/wgsl-access.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,29 +463,29 @@ OpDecorate %388 Location 0
%67 = OpTypeFunction %2
%68 = OpTypePointer Uniform %23
%70 = OpConstant %6 1
%71 = OpConstant %9 1.0
%71 = OpConstant %9 1
%72 = OpConstantComposite %13 %71 %71
%73 = OpConstant %9 2.0
%73 = OpConstant %9 2
%74 = OpConstantComposite %13 %73 %73
%75 = OpConstant %9 3.0
%75 = OpConstant %9 3
%76 = OpConstantComposite %13 %75 %75
%77 = OpConstantComposite %22 %72 %74 %76
%78 = OpConstantComposite %23 %77
%79 = OpConstant %9 6.0
%79 = OpConstant %9 6
%80 = OpConstantComposite %13 %79 %79
%81 = OpConstant %9 5.0
%81 = OpConstant %9 5
%82 = OpConstantComposite %13 %81 %81
%83 = OpConstant %9 4.0
%83 = OpConstant %9 4
%84 = OpConstantComposite %13 %83 %83
%85 = OpConstantComposite %22 %80 %82 %84
%86 = OpConstant %9 9.0
%86 = OpConstant %9 9
%87 = OpConstantComposite %13 %86 %86
%88 = OpConstant %9 90.0
%88 = OpConstant %9 90
%89 = OpConstantComposite %13 %88 %88
%90 = OpConstant %9 10.0
%91 = OpConstant %9 20.0
%92 = OpConstant %9 30.0
%93 = OpConstant %9 40.0
%90 = OpConstant %9 10
%91 = OpConstant %9 20
%92 = OpConstant %9 30
%93 = OpConstant %9 40
%95 = OpTypePointer Function %6
%97 = OpTypePointer Function %23
%101 = OpTypePointer Uniform %22
Expand All @@ -496,9 +496,9 @@ OpDecorate %388 Location 0
%141 = OpTypePointer Uniform %27
%143 = OpConstantNull %26
%144 = OpConstantComposite %27 %143
%145 = OpConstant %9 8.0
%145 = OpConstant %9 8
%146 = OpConstantComposite %13 %145 %145
%147 = OpConstant %9 7.0
%147 = OpConstant %9 7
%148 = OpConstantComposite %13 %147 %147
%149 = OpConstantComposite %25 %146 %148 %80 %82
%152 = OpTypePointer Function %27
Expand Down Expand Up @@ -542,7 +542,7 @@ OpDecorate %388 Location 0
%332 = OpTypePointer Output %32
%331 = OpVariable %332 Output
%335 = OpTypePointer StorageBuffer %24
%338 = OpConstant %9 0.0
%338 = OpConstant %9 0
%339 = OpConstant %4 3
%340 = OpConstant %6 3
%341 = OpConstant %6 4
Expand All @@ -557,8 +557,8 @@ OpDecorate %388 Location 0
%363 = OpTypePointer StorageBuffer %20
%366 = OpTypePointer StorageBuffer %8
%367 = OpTypePointer StorageBuffer %6
%372 = OpConstant %9 -2147483600.0
%373 = OpConstant %9 2147483500.0
%372 = OpConstant %9 -2147483600
%373 = OpConstant %9 2147483500
%382 = OpTypeVector %6 4
%388 = OpVariable %332 Output
%391 = OpConstantComposite %11 %338 %338 %338
Expand Down
10 changes: 5 additions & 5 deletions naga/tests/out/spv/wgsl-aliased-ray-query.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ OpDecorate %13 DescriptorSet 0
OpDecorate %13 Binding 0
%2 = OpTypeVoid
%3 = OpTypeRayQueryKHR
%4 = OpTypeAccelerationStructureNV
%4 = OpTypeAccelerationStructureKHR
%5 = OpTypeFloat 32
%6 = OpTypeVector %5 3
%7 = OpTypeInt 32 0
Expand All @@ -46,17 +46,17 @@ OpDecorate %13 Binding 0
%14 = OpTypePointer UniformConstant %4
%13 = OpVariable %14 UniformConstant
%17 = OpTypeFunction %2
%19 = OpConstant %5 0.0
%19 = OpConstant %5 0
%20 = OpConstantComposite %6 %19 %19 %19
%21 = OpConstant %5 1.0
%21 = OpConstant %5 1
%22 = OpConstantComposite %6 %19 %21 %19
%23 = OpConstant %7 4
%24 = OpConstant %7 255
%25 = OpConstant %5 0.1
%26 = OpConstant %5 100.0
%26 = OpConstant %5 100
%27 = OpConstantComposite %8 %23 %24 %25 %26 %20 %22
%28 = OpConstant %7 3
%29 = OpConstant %5 10.0
%29 = OpConstant %5 10
%30 = OpConstant %7 1
%32 = OpTypePointer Function %3
%40 = OpTypePointer Function %12
Expand Down
6 changes: 3 additions & 3 deletions naga/tests/out/spv/wgsl-array-in-function-return-type.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ OpDecorate %26 Location 0
%7 = OpTypeArray %4 %8
%9 = OpTypeVector %3 4
%12 = OpTypeFunction %4
%13 = OpConstant %3 1.0
%14 = OpConstant %3 2.0
%13 = OpConstant %3 1
%14 = OpConstant %3 2
%15 = OpConstantComposite %4 %13 %14
%19 = OpTypeFunction %7
%27 = OpTypePointer Output %9
%26 = OpVariable %27 Output
%29 = OpTypeFunction %2
%30 = OpConstant %3 0.0
%30 = OpConstant %3 0
%11 = OpFunction %4 None %12
%10 = OpLabel
OpBranch %16
Expand Down
2 changes: 1 addition & 1 deletion naga/tests/out/spv/wgsl-atomicCompareExchange.spvasm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ OpMemberDecorate %15 0 Offset 0
%21 = OpConstant %3 0
%23 = OpConstantFalse %8
%24 = OpTypeFloat 32
%25 = OpConstant %24 1.0
%25 = OpConstant %24 1
%26 = OpConstant %3 1
%28 = OpTypePointer Function %3
%30 = OpTypePointer Function %4
Expand Down
Loading
Loading