From 04e01445598009daf24f69f4e9ee5d14908d8d0c Mon Sep 17 00:00:00 2001 From: SupaMaggie70 Date: Mon, 14 Jul 2025 12:45:04 -0500 Subject: [PATCH 1/2] Update rspirv version --- Cargo.lock | 17 +++++------------ Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7681964afa8..64c090b97ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2505,7 +2505,7 @@ dependencies = [ "rspirv", "rustc-hash", "serde", - "spirv 0.3.0+sdk-1.3.268.0", + "spirv", "strum 0.27.1", "thiserror 2.0.12", "toml", @@ -3549,11 +3549,12 @@ dependencies = [ [[package]] name = "rspirv" -version = "0.11.0+sdk-1.2.198" -source = "git+https://github.com/gfx-rs/rspirv?rev=b969f175d5663258b4891e44b76c1544da9661ab#b969f175d5663258b4891e44b76c1544da9661ab" +version = "0.12.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cf3a93856b6e5946537278df0d3075596371b1950ccff012f02b0f7eafec8d" dependencies = [ "rustc-hash", - "spirv 0.2.0+sdk-1.2.198", + "spirv", ] [[package]] @@ -3932,14 +3933,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spirv" -version = "0.2.0+sdk-1.2.198" -source = "git+https://github.com/gfx-rs/rspirv?rev=b969f175d5663258b4891e44b76c1544da9661ab#b969f175d5663258b4891e44b76c1544da9661ab" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" diff --git a/Cargo.toml b/Cargo.toml index 7083e33a12c..ca7f4121e2c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 From 1250feee106da406644d0a644954d5586cbd3c84 Mon Sep 17 00:00:00 2001 From: SupaMaggie70 Date: Mon, 14 Jul 2025 12:47:30 -0500 Subject: [PATCH 2/2] Updated naga snapshots --- .../spv/wgsl-6438-conflicting-idents.spvasm | 4 +- .../spv/wgsl-7048-multiple-dynamic-1.spvasm | 2 +- .../spv/wgsl-7048-multiple-dynamic-2.spvasm | 2 +- .../spv/wgsl-7048-multiple-dynamic-3.spvasm | 2 +- .../spv/wgsl-abstract-types-builtins.spvasm | 2 +- .../out/spv/wgsl-abstract-types-const.spvasm | 18 +++---- .../wgsl-abstract-types-function-calls.spvasm | 2 +- .../out/spv/wgsl-abstract-types-let.spvasm | 18 +++---- .../spv/wgsl-abstract-types-operators.spvasm | 14 ++--- .../out/spv/wgsl-abstract-types-return.spvasm | 2 +- .../out/spv/wgsl-abstract-types-var.spvasm | 18 +++---- naga/tests/out/spv/wgsl-access.spvasm | 34 ++++++------ .../out/spv/wgsl-aliased-ray-query.spvasm | 10 ++-- .../wgsl-array-in-function-return-type.spvasm | 6 +-- .../out/spv/wgsl-atomicCompareExchange.spvasm | 2 +- naga/tests/out/spv/wgsl-binding-arrays.spvasm | 2 +- naga/tests/out/spv/wgsl-bitcast.spvasm | 2 +- naga/tests/out/spv/wgsl-bits.spvasm | 2 +- naga/tests/out/spv/wgsl-boids.spvasm | 6 +-- ...l-bounds-check-image-restrict-depth.spvasm | 2 +- .../wgsl-bounds-check-image-restrict.spvasm | 2 +- .../wgsl-bounds-check-image-rzsw-depth.spvasm | 2 +- .../spv/wgsl-bounds-check-image-rzsw.spvasm | 2 +- .../out/spv/wgsl-bounds-check-restrict.spvasm | 16 +++--- .../out/spv/wgsl-bounds-check-zero.spvasm | 16 +++--- naga/tests/out/spv/wgsl-const-exprs.spvasm | 10 ++-- naga/tests/out/spv/wgsl-constructors.spvasm | 8 +-- .../spv/wgsl-conversion-float-to-int.spvasm | 54 +++++++++---------- naga/tests/out/spv/wgsl-conversions.spvasm | 2 +- naga/tests/out/spv/wgsl-cross.spvasm | 4 +- .../spv/wgsl-debug-symbol-large-source.spvasm | 28 +++++----- .../out/spv/wgsl-debug-symbol-simple.spvasm | 2 +- .../out/spv/wgsl-debug-symbol-terrain.spvasm | 28 +++++----- naga/tests/out/spv/wgsl-extra.spvasm | 2 +- naga/tests/out/spv/wgsl-f16.spvasm | 14 ++--- naga/tests/out/spv/wgsl-f64.spvasm | 14 ++--- .../tests/out/spv/wgsl-fragment-output.spvasm | 2 +- ...l-functions-optimized-by-capability.spvasm | 12 ++--- ...wgsl-functions-optimized-by-version.spvasm | 12 ++--- naga/tests/out/spv/wgsl-functions.spvasm | 14 ++--- naga/tests/out/spv/wgsl-globals.spvasm | 8 +-- naga/tests/out/spv/wgsl-image.spvasm | 8 +-- naga/tests/out/spv/wgsl-index-by-value.spvasm | 8 +-- naga/tests/out/spv/wgsl-int64.spvasm | 8 +-- .../out/spv/wgsl-interface.fragment.spvasm | 4 +- .../out/spv/wgsl-interface.vertex.spvasm | 2 +- .../wgsl-interface.vertex_two_structs.spvasm | 4 +- naga/tests/out/spv/wgsl-interpolate.spvasm | 42 +++++++-------- .../out/spv/wgsl-interpolate_compat.spvasm | 42 +++++++-------- naga/tests/out/spv/wgsl-math-functions.spvasm | 8 +-- naga/tests/out/spv/wgsl-operators.spvasm | 12 ++--- .../spv/wgsl-overrides-ray-query.main.spvasm | 16 +++--- naga/tests/out/spv/wgsl-overrides.main.spvasm | 10 ++-- naga/tests/out/spv/wgsl-padding.spvasm | 2 +- naga/tests/out/spv/wgsl-pointers.spvasm | 2 +- naga/tests/out/spv/wgsl-policy-mix.spvasm | 4 +- naga/tests/out/spv/wgsl-quad.spvasm | 4 +- naga/tests/out/spv/wgsl-ray-query.spvasm | 10 ++-- naga/tests/out/spv/wgsl-select.spvasm | 4 +- ...wgsl-separate-entry-points.fragment.spvasm | 2 +- naga/tests/out/spv/wgsl-shadow.spvasm | 4 +- naga/tests/out/spv/wgsl-skybox.spvasm | 6 +-- .../out/spv/wgsl-storage-textures.spvasm | 2 +- naga/tests/out/spv/wgsl-struct-layout.spvasm | 2 +- naga/tests/out/spv/wgsl-texture-arg.spvasm | 2 +- naga/tests/out/spv/wgsl-type-inference.spvasm | 4 +- 66 files changed, 307 insertions(+), 307 deletions(-) diff --git a/naga/tests/out/spv/wgsl-6438-conflicting-idents.spvasm b/naga/tests/out/spv/wgsl-6438-conflicting-idents.spvasm index 589eeb34624..be4ca450115 100644 --- a/naga/tests/out/spv/wgsl-6438-conflicting-idents.spvasm +++ b/naga/tests/out/spv/wgsl-6438-conflicting-idents.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-7048-multiple-dynamic-1.spvasm b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-1.spvasm index ad042682297..dd87117cfc4 100644 --- a/naga/tests/out/spv/wgsl-7048-multiple-dynamic-1.spvasm +++ b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-1.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-7048-multiple-dynamic-2.spvasm b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-2.spvasm index 504bd8f4eb3..1eba8a12a5e 100644 --- a/naga/tests/out/spv/wgsl-7048-multiple-dynamic-2.spvasm +++ b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-2.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-7048-multiple-dynamic-3.spvasm b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-3.spvasm index d11c182d519..2e4ab1e1aef 100644 --- a/naga/tests/out/spv/wgsl-7048-multiple-dynamic-3.spvasm +++ b/naga/tests/out/spv/wgsl-7048-multiple-dynamic-3.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-abstract-types-builtins.spvasm b/naga/tests/out/spv/wgsl-abstract-types-builtins.spvasm index 83ef259cba5..0601a126b1b 100644 --- a/naga/tests/out/spv/wgsl-abstract-types-builtins.spvasm +++ b/naga/tests/out/spv/wgsl-abstract-types-builtins.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-abstract-types-const.spvasm b/naga/tests/out/spv/wgsl-abstract-types-const.spvasm index b1da55273f5..b1dd0dc374e 100644 --- a/naga/tests/out/spv/wgsl-abstract-types-const.spvasm +++ b/naga/tests/out/spv/wgsl-abstract-types-const.spvasm @@ -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 @@ -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 diff --git a/naga/tests/out/spv/wgsl-abstract-types-function-calls.spvasm b/naga/tests/out/spv/wgsl-abstract-types-function-calls.spvasm index 81b0a5e44c5..40931665253 100644 --- a/naga/tests/out/spv/wgsl-abstract-types-function-calls.spvasm +++ b/naga/tests/out/spv/wgsl-abstract-types-function-calls.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-abstract-types-let.spvasm b/naga/tests/out/spv/wgsl-abstract-types-let.spvasm index f0b7ea3c4f3..c9394ebaf4c 100644 --- a/naga/tests/out/spv/wgsl-abstract-types-let.spvasm +++ b/naga/tests/out/spv/wgsl-abstract-types-let.spvasm @@ -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 @@ -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 diff --git a/naga/tests/out/spv/wgsl-abstract-types-operators.spvasm b/naga/tests/out/spv/wgsl-abstract-types-operators.spvasm index c37f96d92bf..4ce80049d24 100644 --- a/naga/tests/out/spv/wgsl-abstract-types-operators.spvasm +++ b/naga/tests/out/spv/wgsl-abstract-types-operators.spvasm @@ -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 @@ -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 diff --git a/naga/tests/out/spv/wgsl-abstract-types-return.spvasm b/naga/tests/out/spv/wgsl-abstract-types-return.spvasm index 48c1b155668..d2dc2cfed43 100644 --- a/naga/tests/out/spv/wgsl-abstract-types-return.spvasm +++ b/naga/tests/out/spv/wgsl-abstract-types-return.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-abstract-types-var.spvasm b/naga/tests/out/spv/wgsl-abstract-types-var.spvasm index de7b74dae48..8dc36f0fb5f 100644 --- a/naga/tests/out/spv/wgsl-abstract-types-var.spvasm +++ b/naga/tests/out/spv/wgsl-abstract-types-var.spvasm @@ -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 @@ -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 diff --git a/naga/tests/out/spv/wgsl-access.spvasm b/naga/tests/out/spv/wgsl-access.spvasm index ae6a1d1c5f2..78d263d5fc6 100644 --- a/naga/tests/out/spv/wgsl-access.spvasm +++ b/naga/tests/out/spv/wgsl-access.spvasm @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/naga/tests/out/spv/wgsl-aliased-ray-query.spvasm b/naga/tests/out/spv/wgsl-aliased-ray-query.spvasm index 2dc19683634..b095e8b8e83 100644 --- a/naga/tests/out/spv/wgsl-aliased-ray-query.spvasm +++ b/naga/tests/out/spv/wgsl-aliased-ray-query.spvasm @@ -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 @@ -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 diff --git a/naga/tests/out/spv/wgsl-array-in-function-return-type.spvasm b/naga/tests/out/spv/wgsl-array-in-function-return-type.spvasm index 146e032f354..9e2b2220f25 100644 --- a/naga/tests/out/spv/wgsl-array-in-function-return-type.spvasm +++ b/naga/tests/out/spv/wgsl-array-in-function-return-type.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-atomicCompareExchange.spvasm b/naga/tests/out/spv/wgsl-atomicCompareExchange.spvasm index 8b7e4ded087..e0e32c85d82 100644 --- a/naga/tests/out/spv/wgsl-atomicCompareExchange.spvasm +++ b/naga/tests/out/spv/wgsl-atomicCompareExchange.spvasm @@ -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 diff --git a/naga/tests/out/spv/wgsl-binding-arrays.spvasm b/naga/tests/out/spv/wgsl-binding-arrays.spvasm index 074aff8f9bc..c95bef4c567 100644 --- a/naga/tests/out/spv/wgsl-binding-arrays.spvasm +++ b/naga/tests/out/spv/wgsl-binding-arrays.spvasm @@ -130,7 +130,7 @@ OpDecorate %395 NonUniform %54 = OpTypePointer Uniform %4 %55 = OpConstant %3 0 %57 = OpConstantComposite %23 %55 %55 -%58 = OpConstant %6 0.0 +%58 = OpConstant %6 0 %59 = OpConstantComposite %22 %58 %58 %58 %58 %60 = OpTypeVector %6 2 %61 = OpConstantComposite %60 %58 %58 diff --git a/naga/tests/out/spv/wgsl-bitcast.spvasm b/naga/tests/out/spv/wgsl-bitcast.spvasm index 43dfa8df339..28b8fe56954 100644 --- a/naga/tests/out/spv/wgsl-bitcast.spvasm +++ b/naga/tests/out/spv/wgsl-bitcast.spvasm @@ -29,7 +29,7 @@ OpExecutionMode %16 LocalSize 1 1 1 %23 = OpConstantComposite %7 %22 %22 %24 = OpConstantComposite %9 %22 %22 %22 %25 = OpConstantComposite %10 %22 %22 %22 %22 -%26 = OpConstant %12 0.0 +%26 = OpConstant %12 0 %27 = OpConstantComposite %11 %26 %26 %28 = OpConstantComposite %13 %26 %26 %26 %29 = OpConstantComposite %14 %26 %26 %26 %26 diff --git a/naga/tests/out/spv/wgsl-bits.spvasm b/naga/tests/out/spv/wgsl-bits.spvasm index dec26768b3a..90786720f1a 100644 --- a/naga/tests/out/spv/wgsl-bits.spvasm +++ b/naga/tests/out/spv/wgsl-bits.spvasm @@ -29,7 +29,7 @@ OpExecutionMode %15 LocalSize 1 1 1 %22 = OpConstantComposite %8 %21 %21 %23 = OpConstantComposite %9 %21 %21 %21 %24 = OpConstantComposite %10 %21 %21 %21 %21 -%25 = OpConstant %12 0.0 +%25 = OpConstant %12 0 %26 = OpConstantComposite %11 %25 %25 %27 = OpConstantComposite %13 %25 %25 %25 %25 %28 = OpConstant %7 5 diff --git a/naga/tests/out/spv/wgsl-boids.spvasm b/naga/tests/out/spv/wgsl-boids.spvasm index 35bda2793b4..837d9326cd4 100644 --- a/naga/tests/out/spv/wgsl-boids.spvasm +++ b/naga/tests/out/spv/wgsl-boids.spvasm @@ -191,14 +191,14 @@ OpDecorate %21 BuiltIn GlobalInvocationId %25 = OpTypeFunction %2 %26 = OpTypePointer Uniform %8 %27 = OpConstant %4 0 -%29 = OpConstant %5 0.0 +%29 = OpConstant %5 0 %30 = OpConstantComposite %6 %29 %29 %31 = OpConstant %12 0 %32 = OpConstant %12 1 %33 = OpConstant %4 1 %34 = OpConstant %5 0.1 -%35 = OpConstant %5 -1.0 -%36 = OpConstant %5 1.0 +%35 = OpConstant %5 -1 +%36 = OpConstant %5 1 %38 = OpTypePointer Function %6 %39 = OpConstantNull %6 %41 = OpConstantNull %6 diff --git a/naga/tests/out/spv/wgsl-bounds-check-image-restrict-depth.spvasm b/naga/tests/out/spv/wgsl-bounds-check-image-restrict-depth.spvasm index b8a36ed3dfc..2f7efbe55df 100644 --- a/naga/tests/out/spv/wgsl-bounds-check-image-restrict-depth.spvasm +++ b/naga/tests/out/spv/wgsl-bounds-check-image-restrict-depth.spvasm @@ -101,7 +101,7 @@ OpDecorate %89 Location 0 %96 = OpConstantNull %7 %97 = OpConstant %6 0 %98 = OpConstant %9 0 -%99 = OpConstant %5 0.0 +%99 = OpConstant %5 0 %100 = OpConstantComposite %11 %99 %99 %99 %99 %21 = OpFunction %5 None %22 %19 = OpFunctionParameter %7 diff --git a/naga/tests/out/spv/wgsl-bounds-check-image-restrict.spvasm b/naga/tests/out/spv/wgsl-bounds-check-image-restrict.spvasm index aa311f557e6..4a7b1240e14 100644 --- a/naga/tests/out/spv/wgsl-bounds-check-image-restrict.spvasm +++ b/naga/tests/out/spv/wgsl-bounds-check-image-restrict.spvasm @@ -229,7 +229,7 @@ OpDecorate %172 Location 0 %187 = OpConstant %11 0 %188 = OpConstantNull %13 %189 = OpConstantNull %7 -%190 = OpConstant %5 0.0 +%190 = OpConstant %5 0 %191 = OpConstantComposite %7 %190 %190 %190 %190 %40 = OpFunction %7 None %41 %38 = OpFunctionParameter %6 diff --git a/naga/tests/out/spv/wgsl-bounds-check-image-rzsw-depth.spvasm b/naga/tests/out/spv/wgsl-bounds-check-image-rzsw-depth.spvasm index 0db821d3bf3..4ecca6c2f38 100644 --- a/naga/tests/out/spv/wgsl-bounds-check-image-rzsw-depth.spvasm +++ b/naga/tests/out/spv/wgsl-bounds-check-image-rzsw-depth.spvasm @@ -100,7 +100,7 @@ OpDecorate %100 Location 0 %107 = OpConstantNull %7 %108 = OpConstant %6 0 %109 = OpConstant %9 0 -%110 = OpConstant %5 0.0 +%110 = OpConstant %5 0 %111 = OpConstantComposite %11 %110 %110 %110 %110 %21 = OpFunction %5 None %22 %19 = OpFunctionParameter %7 diff --git a/naga/tests/out/spv/wgsl-bounds-check-image-rzsw.spvasm b/naga/tests/out/spv/wgsl-bounds-check-image-rzsw.spvasm index 7eb0c8b6121..814d2aa24df 100644 --- a/naga/tests/out/spv/wgsl-bounds-check-image-rzsw.spvasm +++ b/naga/tests/out/spv/wgsl-bounds-check-image-rzsw.spvasm @@ -226,7 +226,7 @@ OpDecorate %187 Location 0 %201 = OpConstantNull %9 %202 = OpConstant %11 0 %203 = OpConstantNull %13 -%204 = OpConstant %5 0.0 +%204 = OpConstant %5 0 %205 = OpConstantComposite %7 %204 %204 %204 %204 %40 = OpFunction %7 None %41 %38 = OpFunctionParameter %6 diff --git a/naga/tests/out/spv/wgsl-bounds-check-restrict.spvasm b/naga/tests/out/spv/wgsl-bounds-check-restrict.spvasm index 9885a0bde73..86a0a0547c6 100644 --- a/naga/tests/out/spv/wgsl-bounds-check-restrict.spvasm +++ b/naga/tests/out/spv/wgsl-bounds-check-restrict.spvasm @@ -45,9 +45,9 @@ OpDecorate %12 Binding 0 %59 = OpTypePointer StorageBuffer %8 %60 = OpConstant %6 2 %68 = OpTypeFunction %3 %11 %11 -%77 = OpConstant %3 100.0 -%83 = OpConstant %3 -2147483600.0 -%84 = OpConstant %3 2147483500.0 +%77 = OpConstant %3 100 +%83 = OpConstant %3 -2147483600 +%84 = OpConstant %3 2147483500 %92 = OpTypeFunction %3 %106 = OpTypeFunction %2 %11 %3 %130 = OpTypeFunction %2 %11 %7 @@ -56,14 +56,14 @@ OpDecorate %12 Binding 0 %170 = OpConstant %6 1000 %184 = OpTypeFunction %2 %185 = OpConstant %11 1 -%186 = OpConstant %3 2.0 -%187 = OpConstant %3 3.0 -%188 = OpConstant %3 4.0 -%189 = OpConstant %3 5.0 +%186 = OpConstant %3 2 +%187 = OpConstant %3 3 +%188 = OpConstant %3 4 +%189 = OpConstant %3 5 %190 = OpConstantComposite %7 %186 %187 %188 %189 %191 = OpConstant %11 6 %192 = OpConstant %11 2 -%193 = OpConstant %3 1.0 +%193 = OpConstant %3 1 %16 = OpFunction %3 None %17 %15 = OpFunctionParameter %11 %14 = OpLabel diff --git a/naga/tests/out/spv/wgsl-bounds-check-zero.spvasm b/naga/tests/out/spv/wgsl-bounds-check-zero.spvasm index c31e9e1ab73..f8cd0080678 100644 --- a/naga/tests/out/spv/wgsl-bounds-check-zero.spvasm +++ b/naga/tests/out/spv/wgsl-bounds-check-zero.spvasm @@ -48,9 +48,9 @@ OpDecorate %12 Binding 0 %74 = OpConstant %6 2 %76 = OpConstantNull %7 %85 = OpTypeFunction %3 %11 %11 -%98 = OpConstant %3 100.0 -%104 = OpConstant %3 -2147483600.0 -%105 = OpConstant %3 2147483500.0 +%98 = OpConstant %3 100 +%104 = OpConstant %3 -2147483600 +%105 = OpConstant %3 2147483500 %116 = OpTypeFunction %3 %118 = OpConstant %6 9 %131 = OpTypeFunction %2 %11 %3 @@ -60,14 +60,14 @@ OpDecorate %12 Binding 0 %206 = OpConstant %6 1000 %224 = OpTypeFunction %2 %225 = OpConstant %11 1 -%226 = OpConstant %3 2.0 -%227 = OpConstant %3 3.0 -%228 = OpConstant %3 4.0 -%229 = OpConstant %3 5.0 +%226 = OpConstant %3 2 +%227 = OpConstant %3 3 +%228 = OpConstant %3 4 +%229 = OpConstant %3 5 %230 = OpConstantComposite %7 %226 %227 %228 %229 %231 = OpConstant %11 6 %232 = OpConstant %11 2 -%233 = OpConstant %3 1.0 +%233 = OpConstant %3 1 %16 = OpFunction %3 None %17 %15 = OpFunctionParameter %11 %14 = OpLabel diff --git a/naga/tests/out/spv/wgsl-const-exprs.spvasm b/naga/tests/out/spv/wgsl-const-exprs.spvasm index c4413460f1e..84701b9e163 100644 --- a/naga/tests/out/spv/wgsl-const-exprs.spvasm +++ b/naga/tests/out/spv/wgsl-const-exprs.spvasm @@ -34,10 +34,10 @@ OpDecorate %13 ArrayStride 4 %24 = OpConstant %7 3.141 %25 = OpConstant %7 6.282 %26 = OpConstant %7 0.44444445 -%27 = OpConstant %7 0.0 +%27 = OpConstant %7 0 %28 = OpConstantComposite %8 %26 %27 %27 %27 -%29 = OpConstant %7 4.0 -%30 = OpConstant %7 5.0 +%29 = OpConstant %7 4 +%30 = OpConstant %7 5 %31 = OpConstantComposite %15 %29 %30 %32 = OpConstantComposite %12 %17 %18 %35 = OpTypeFunction %2 @@ -58,8 +58,8 @@ OpDecorate %13 ArrayStride 4 %86 = OpConstant %3 30 %87 = OpConstant %3 0 %94 = OpConstantNull %3 -%97 = OpConstant %7 1.0 -%98 = OpConstant %7 2.0 +%97 = OpConstant %7 1 +%98 = OpConstant %7 2 %99 = OpConstantComposite %8 %98 %97 %97 %97 %101 = OpTypePointer Function %8 %106 = OpTypePointer Function %9 diff --git a/naga/tests/out/spv/wgsl-constructors.spvasm b/naga/tests/out/spv/wgsl-constructors.spvasm index 233cb2735ea..0192183dc84 100644 --- a/naga/tests/out/spv/wgsl-constructors.spvasm +++ b/naga/tests/out/spv/wgsl-constructors.spvasm @@ -31,11 +31,11 @@ OpDecorate %18 ArrayStride 4 %19 = OpConstant %12 4 %18 = OpTypeArray %5 %19 %20 = OpTypeMatrix %7 2 -%21 = OpConstant %3 0.0 +%21 = OpConstant %3 0 %22 = OpConstantComposite %7 %21 %21 %21 -%23 = OpConstant %3 1.0 -%24 = OpConstant %3 2.0 -%25 = OpConstant %3 3.0 +%23 = OpConstant %3 1 +%24 = OpConstant %3 2 +%25 = OpConstant %3 3 %26 = OpConstantComposite %9 %21 %23 %27 = OpConstantComposite %9 %24 %25 %28 = OpConstantComposite %8 %26 %27 diff --git a/naga/tests/out/spv/wgsl-conversion-float-to-int.spvasm b/naga/tests/out/spv/wgsl-conversion-float-to-int.spvasm index 10cbbe3b8c4..8d8168bfc00 100644 --- a/naga/tests/out/spv/wgsl-conversion-float-to-int.spvasm +++ b/naga/tests/out/spv/wgsl-conversion-float-to-int.spvasm @@ -29,12 +29,12 @@ OpExecutionMode %278 LocalSize 1 1 1 %14 = OpTypeVector %9 2 %15 = OpTypeVector %4 2 %16 = OpTypeVector %5 2 -%17 = OpConstant %3 9.0399e-41 -%18 = OpConstant %3 4.4481e-41 -%19 = OpConstant %4 -3.4028235e38 -%20 = OpConstant %4 3.4028235e38 -%21 = OpConstant %5 -1.7976931348623157e308 -%22 = OpConstant %5 1.7976931348623157e308 +%17 = OpConstant %3 0.000000000000000000000000000000000000000090399 +%18 = OpConstant %3 0.000000000000000000000000000000000000000044481 +%19 = OpConstant %4 -340282350000000000000000000000000000000 +%20 = OpConstant %4 340282350000000000000000000000000000000 +%21 = OpConstant %5 -179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +%22 = OpConstant %5 179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %25 = OpTypeFunction %2 %26 = OpConstant %6 -65504 %27 = OpConstant %6 65504 @@ -60,31 +60,31 @@ OpExecutionMode %278 LocalSize 1 1 1 %54 = OpTypePointer Function %9 %80 = OpTypeFunction %6 %3 %87 = OpTypeFunction %7 %3 -%89 = OpConstant %3 0.0 +%89 = OpConstant %3 0 %95 = OpTypeFunction %8 %3 %102 = OpTypeFunction %9 %3 %109 = OpTypeFunction %6 %4 -%111 = OpConstant %4 -2147483600.0 -%112 = OpConstant %4 2147483500.0 +%111 = OpConstant %4 -2147483600 +%112 = OpConstant %4 2147483500 %118 = OpTypeFunction %7 %4 -%120 = OpConstant %4 0.0 -%121 = OpConstant %4 4294967000.0 +%120 = OpConstant %4 0 +%121 = OpConstant %4 4294967000 %127 = OpTypeFunction %8 %4 -%129 = OpConstant %4 -9.223372e18 -%130 = OpConstant %4 9.2233715e18 +%129 = OpConstant %4 -9223372000000000000 +%130 = OpConstant %4 9223371500000000000 %136 = OpTypeFunction %9 %4 -%138 = OpConstant %4 1.8446743e19 +%138 = OpConstant %4 18446743000000000000 %144 = OpTypeFunction %6 %5 -%146 = OpConstant %5 -2147483648.0 -%147 = OpConstant %5 2147483647.0 +%146 = OpConstant %5 -2147483648 +%147 = OpConstant %5 2147483647 %153 = OpTypeFunction %7 %5 -%155 = OpConstant %5 0.0 -%156 = OpConstant %5 4294967295.0 +%155 = OpConstant %5 0 +%156 = OpConstant %5 4294967295 %162 = OpTypeFunction %8 %5 -%164 = OpConstant %5 -9.223372036854776e18 -%165 = OpConstant %5 9.223372036854775e18 +%164 = OpConstant %5 -9223372036854776000 +%165 = OpConstant %5 9223372036854775000 %171 = OpTypeFunction %9 %5 -%173 = OpConstant %5 1.844674407370955e19 +%173 = OpConstant %5 18446744073709550000 %179 = OpTypeFunction %11 %10 %181 = OpConstantComposite %10 %17 %17 %182 = OpConstantComposite %10 %18 %18 @@ -114,14 +114,14 @@ OpExecutionMode %278 LocalSize 1 1 1 %266 = OpConstantComposite %16 %165 %165 %272 = OpTypeFunction %14 %16 %274 = OpConstantComposite %16 %173 %173 -%279 = OpConstant %3 2.1524e-41 -%280 = OpConstant %4 1.0 -%281 = OpConstant %5 1.0 -%282 = OpConstant %3 2.2959e-41 +%279 = OpConstant %3 0.000000000000000000000000000000000000000021524 +%280 = OpConstant %4 1 +%281 = OpConstant %5 1 +%282 = OpConstant %3 0.000000000000000000000000000000000000000022959 %283 = OpConstantComposite %10 %279 %282 -%284 = OpConstant %4 2.0 +%284 = OpConstant %4 2 %285 = OpConstantComposite %15 %280 %284 -%286 = OpConstant %5 2.0 +%286 = OpConstant %5 2 %287 = OpConstantComposite %16 %281 %286 %24 = OpFunction %2 None %25 %23 = OpLabel diff --git a/naga/tests/out/spv/wgsl-conversions.spvasm b/naga/tests/out/spv/wgsl-conversions.spvasm index 5dae778e115..112979819ce 100644 --- a/naga/tests/out/spv/wgsl-conversions.spvasm +++ b/naga/tests/out/spv/wgsl-conversions.spvasm @@ -10,7 +10,7 @@ OpExecutionMode %8 LocalSize 1 1 1 %2 = OpTypeVoid %4 = OpTypeFloat 32 %3 = OpTypeVector %4 2 -%5 = OpConstant %4 2.0 +%5 = OpConstant %4 2 %6 = OpConstantComposite %3 %5 %5 %9 = OpTypeFunction %2 %11 = OpTypePointer Function %3 diff --git a/naga/tests/out/spv/wgsl-cross.spvasm b/naga/tests/out/spv/wgsl-cross.spvasm index fd13684894b..849b26ef778 100644 --- a/naga/tests/out/spv/wgsl-cross.spvasm +++ b/naga/tests/out/spv/wgsl-cross.spvasm @@ -11,8 +11,8 @@ OpExecutionMode %6 LocalSize 1 1 1 %4 = OpTypeFloat 32 %3 = OpTypeVector %4 3 %7 = OpTypeFunction %2 -%8 = OpConstant %4 0.0 -%9 = OpConstant %4 1.0 +%8 = OpConstant %4 0 +%9 = OpConstant %4 1 %10 = OpConstantComposite %3 %8 %8 %9 %6 = OpFunction %2 None %7 %5 = OpLabel diff --git a/naga/tests/out/spv/wgsl-debug-symbol-large-source.spvasm b/naga/tests/out/spv/wgsl-debug-symbol-large-source.spvasm index f1db8e611ed..ef1d8bc534f 100644 --- a/naga/tests/out/spv/wgsl-debug-symbol-large-source.spvasm +++ b/naga/tests/out/spv/wgsl-debug-symbol-large-source.spvasm @@ -7716,10 +7716,10 @@ OpDecorate %614 Location 0 %49 = OpVariable %46 UniformConstant %50 = OpVariable %48 UniformConstant %54 = OpTypeFunction %5 %5 -%55 = OpConstant %4 34.0 -%56 = OpConstant %4 1.0 +%55 = OpConstant %4 34 +%56 = OpConstant %4 1 %57 = OpConstantComposite %5 %56 %56 %56 -%58 = OpConstant %4 289.0 +%58 = OpConstant %4 289 %59 = OpConstantComposite %5 %58 %58 %58 %68 = OpTypeFunction %4 %6 %69 = OpConstant %4 0.21132487 @@ -7727,18 +7727,18 @@ OpDecorate %614 Location 0 %71 = OpConstant %4 -0.57735026 %72 = OpConstant %4 0.024390243 %73 = OpConstantComposite %7 %69 %70 %71 %72 -%74 = OpConstant %4 0.0 +%74 = OpConstant %4 0 %75 = OpConstantComposite %6 %56 %74 %76 = OpConstantComposite %6 %74 %56 %77 = OpConstantComposite %6 %58 %58 %78 = OpConstant %4 0.5 %79 = OpConstantComposite %5 %78 %78 %78 %80 = OpConstantComposite %5 %74 %74 %74 -%81 = OpConstant %4 2.0 +%81 = OpConstant %4 2 %82 = OpConstant %4 0.85373473 %83 = OpConstant %4 1.7928429 %84 = OpConstantComposite %5 %83 %83 %83 -%85 = OpConstant %4 130.0 +%85 = OpConstant %4 130 %87 = OpTypePointer Function %6 %88 = OpConstantNull %6 %90 = OpConstantNull %6 @@ -7753,7 +7753,7 @@ OpDecorate %614 Location 0 %135 = OpConstant %8 0 %205 = OpConstant %8 5 %206 = OpConstant %4 0.01 -%207 = OpConstant %4 100.0 +%207 = OpConstant %4 100 %208 = OpConstantComposite %6 %207 %207 %209 = OpConstant %4 0.87758255 %210 = OpConstant %4 0.47942555 @@ -7775,11 +7775,11 @@ OpDecorate %614 Location 0 %314 = OpTypeFunction %8 %8 %8 %326 = OpTypeFunction %6 %8 %10 %11 %343 = OpTypeFunction %5 %6 -%344 = OpConstant %4 23.0 -%345 = OpConstant %4 32.0 +%344 = OpConstant %4 23 +%345 = OpConstant %4 32 %346 = OpConstantComposite %6 %344 %345 -%347 = OpConstant %4 -43.0 -%348 = OpConstant %4 3.0 +%347 = OpConstant %4 -43 +%348 = OpConstant %4 3 %349 = OpConstantComposite %6 %347 %348 %365 = OpTypePointer Input %19 %364 = OpVariable %365 Input @@ -7806,9 +7806,9 @@ OpDecorate %614 Location 0 %443 = OpTypePointer Output %6 %442 = OpVariable %443 Output %445 = OpTypePointer Uniform %20 -%447 = OpConstant %4 -1.0 +%447 = OpConstant %4 -1 %448 = OpConstantComposite %6 %447 %447 -%473 = OpConstant %4 4294967000.0 +%473 = OpConstant %4 4294967000 %485 = OpVariable %436 Input %488 = OpTypePointer Input %7 %487 = OpVariable %488 Input @@ -7816,7 +7816,7 @@ OpDecorate %614 Location 0 %490 = OpVariable %491 Input %493 = OpVariable %439 Output %494 = OpVariable %439 Output -%497 = OpConstant %4 6.0 +%497 = OpConstant %4 6 %582 = OpTypePointer Input %5 %581 = OpVariable %582 Input %584 = OpVariable %582 Input diff --git a/naga/tests/out/spv/wgsl-debug-symbol-simple.spvasm b/naga/tests/out/spv/wgsl-debug-symbol-simple.spvasm index bde02c231de..4adb3411b35 100644 --- a/naga/tests/out/spv/wgsl-debug-symbol-simple.spvasm +++ b/naga/tests/out/spv/wgsl-debug-symbol-simple.spvasm @@ -87,7 +87,7 @@ OpDecorate %48 Location 0 %20 = OpTypePointer Output %5 %19 = OpVariable %20 Output %22 = OpTypeFunction %2 -%23 = OpConstant %4 1.0 +%23 = OpConstant %4 1 %25 = OpTypePointer Function %8 %26 = OpConstantNull %8 %28 = OpTypePointer Function %5 diff --git a/naga/tests/out/spv/wgsl-debug-symbol-terrain.spvasm b/naga/tests/out/spv/wgsl-debug-symbol-terrain.spvasm index 69f08bcdb62..47009186afb 100644 --- a/naga/tests/out/spv/wgsl-debug-symbol-terrain.spvasm +++ b/naga/tests/out/spv/wgsl-debug-symbol-terrain.spvasm @@ -551,10 +551,10 @@ OpDecorate %614 Location 0 %49 = OpVariable %46 UniformConstant %50 = OpVariable %48 UniformConstant %54 = OpTypeFunction %5 %5 -%55 = OpConstant %4 34.0 -%56 = OpConstant %4 1.0 +%55 = OpConstant %4 34 +%56 = OpConstant %4 1 %57 = OpConstantComposite %5 %56 %56 %56 -%58 = OpConstant %4 289.0 +%58 = OpConstant %4 289 %59 = OpConstantComposite %5 %58 %58 %58 %68 = OpTypeFunction %4 %6 %69 = OpConstant %4 0.21132487 @@ -562,18 +562,18 @@ OpDecorate %614 Location 0 %71 = OpConstant %4 -0.57735026 %72 = OpConstant %4 0.024390243 %73 = OpConstantComposite %7 %69 %70 %71 %72 -%74 = OpConstant %4 0.0 +%74 = OpConstant %4 0 %75 = OpConstantComposite %6 %56 %74 %76 = OpConstantComposite %6 %74 %56 %77 = OpConstantComposite %6 %58 %58 %78 = OpConstant %4 0.5 %79 = OpConstantComposite %5 %78 %78 %78 %80 = OpConstantComposite %5 %74 %74 %74 -%81 = OpConstant %4 2.0 +%81 = OpConstant %4 2 %82 = OpConstant %4 0.85373473 %83 = OpConstant %4 1.7928429 %84 = OpConstantComposite %5 %83 %83 %83 -%85 = OpConstant %4 130.0 +%85 = OpConstant %4 130 %87 = OpTypePointer Function %6 %88 = OpConstantNull %6 %90 = OpConstantNull %6 @@ -588,7 +588,7 @@ OpDecorate %614 Location 0 %135 = OpConstant %8 0 %205 = OpConstant %8 5 %206 = OpConstant %4 0.01 -%207 = OpConstant %4 100.0 +%207 = OpConstant %4 100 %208 = OpConstantComposite %6 %207 %207 %209 = OpConstant %4 0.87758255 %210 = OpConstant %4 0.47942555 @@ -610,11 +610,11 @@ OpDecorate %614 Location 0 %314 = OpTypeFunction %8 %8 %8 %326 = OpTypeFunction %6 %8 %10 %11 %343 = OpTypeFunction %5 %6 -%344 = OpConstant %4 23.0 -%345 = OpConstant %4 32.0 +%344 = OpConstant %4 23 +%345 = OpConstant %4 32 %346 = OpConstantComposite %6 %344 %345 -%347 = OpConstant %4 -43.0 -%348 = OpConstant %4 3.0 +%347 = OpConstant %4 -43 +%348 = OpConstant %4 3 %349 = OpConstantComposite %6 %347 %348 %365 = OpTypePointer Input %19 %364 = OpVariable %365 Input @@ -641,9 +641,9 @@ OpDecorate %614 Location 0 %443 = OpTypePointer Output %6 %442 = OpVariable %443 Output %445 = OpTypePointer Uniform %20 -%447 = OpConstant %4 -1.0 +%447 = OpConstant %4 -1 %448 = OpConstantComposite %6 %447 %447 -%473 = OpConstant %4 4294967000.0 +%473 = OpConstant %4 4294967000 %485 = OpVariable %436 Input %488 = OpTypePointer Input %7 %487 = OpVariable %488 Input @@ -651,7 +651,7 @@ OpDecorate %614 Location 0 %490 = OpVariable %491 Input %493 = OpVariable %439 Output %494 = OpVariable %439 Output -%497 = OpConstant %4 6.0 +%497 = OpConstant %4 6 %582 = OpTypePointer Input %5 %581 = OpVariable %582 Input %584 = OpVariable %582 Input diff --git a/naga/tests/out/spv/wgsl-extra.spvasm b/naga/tests/out/spv/wgsl-extra.spvasm index 0e84427bad4..0d091ae1fe2 100644 --- a/naga/tests/out/spv/wgsl-extra.spvasm +++ b/naga/tests/out/spv/wgsl-extra.spvasm @@ -37,7 +37,7 @@ OpDecorate %20 Location 0 %23 = OpTypeFunction %2 %24 = OpTypePointer PushConstant %6 %25 = OpConstant %3 0 -%27 = OpConstant %5 1.0 +%27 = OpConstant %5 1 %28 = OpTypeVector %5 3 %29 = OpConstantComposite %28 %27 %27 %27 %32 = OpTypePointer PushConstant %3 diff --git a/naga/tests/out/spv/wgsl-f16.spvasm b/naga/tests/out/spv/wgsl-f16.spvasm index d6aed42b4eb..4fc6963ce87 100644 --- a/naga/tests/out/spv/wgsl-f16.spvasm +++ b/naga/tests/out/spv/wgsl-f16.spvasm @@ -100,8 +100,8 @@ OpMemberDecorate %41 0 Offset 0 %20 = OpTypeArray %3 %21 %22 = OpTypeStruct %20 %23 = OpTypeStruct %3 %3 %8 %3 %3 %4 -%24 = OpConstant %3 2.1524e-41 -%25 = OpConstant %3 2.7121e-41 +%24 = OpConstant %3 0.000000000000000000000000000000000000000021524 +%25 = OpConstant %3 0.000000000000000000000000000000000000000027121 %27 = OpTypePointer Private %3 %26 = OpVariable %27 Private %24 %29 = OpTypeStruct %19 @@ -124,13 +124,13 @@ OpMemberDecorate %41 0 Offset 0 %48 = OpConstant %4 0 %50 = OpTypePointer StorageBuffer %19 %52 = OpTypePointer StorageBuffer %22 -%56 = OpConstant %3 8.8991e-41 -%57 = OpConstant %3 2.4753e-41 +%56 = OpConstant %3 0.000000000000000000000000000000000000000088991 +%57 = OpConstant %3 0.000000000000000000000000000000000000000024753 %58 = OpConstant %5 65504 %59 = OpConstant %5 -65504 %60 = OpConstant %4 65504 -%61 = OpConstant %6 65504.0 -%62 = OpConstant %6 -65504.0 +%61 = OpConstant %6 65504 +%62 = OpConstant %6 -65504 %64 = OpTypePointer Function %23 %65 = OpConstantNull %23 %67 = OpTypePointer Function %3 @@ -192,7 +192,7 @@ OpMemberDecorate %41 0 Offset 0 %474 = OpTypeMatrix %344 4 %496 = OpTypeMatrix %350 4 %519 = OpTypeFunction %2 -%525 = OpConstant %3 2.2959e-41 +%525 = OpConstant %3 0.000000000000000000000000000000000000000022959 %528 = OpConstant %4 7 %45 = OpFunction %3 None %46 %44 = OpFunctionParameter %3 diff --git a/naga/tests/out/spv/wgsl-f64.spvasm b/naga/tests/out/spv/wgsl-f64.spvasm index d51bc3c8535..fd0fa038e1c 100644 --- a/naga/tests/out/spv/wgsl-f64.spvasm +++ b/naga/tests/out/spv/wgsl-f64.spvasm @@ -10,19 +10,19 @@ OpEntryPoint GLCompute %28 "main" OpExecutionMode %28 LocalSize 1 1 1 %2 = OpTypeVoid %3 = OpTypeFloat 64 -%4 = OpConstant %3 1.0 -%5 = OpConstant %3 2.0 +%4 = OpConstant %3 1 +%5 = OpConstant %3 2 %7 = OpTypePointer Private %3 %6 = OpVariable %7 Private %4 %11 = OpTypeFunction %3 %3 -%12 = OpConstant %3 30.0 -%13 = OpConstant %3 400.0 -%14 = OpConstant %3 5.0 -%15 = OpConstant %3 -1.0 +%12 = OpConstant %3 30 +%13 = OpConstant %3 400 +%14 = OpConstant %3 5 +%15 = OpConstant %3 -1 %17 = OpTypePointer Function %3 %18 = OpConstantNull %3 %29 = OpTypeFunction %2 -%30 = OpConstant %3 6.0 +%30 = OpConstant %3 6 %10 = OpFunction %3 None %11 %9 = OpFunctionParameter %3 %8 = OpLabel diff --git a/naga/tests/out/spv/wgsl-fragment-output.spvasm b/naga/tests/out/spv/wgsl-fragment-output.spvasm index 414c646c73c..cad9ebf7b24 100644 --- a/naga/tests/out/spv/wgsl-fragment-output.spvasm +++ b/naga/tests/out/spv/wgsl-fragment-output.spvasm @@ -61,7 +61,7 @@ OpDecorate %80 Location 5 %29 = OpTypePointer Output %11 %28 = OpVariable %29 Output %31 = OpTypeFunction %2 -%32 = OpConstant %3 0.0 +%32 = OpConstant %3 0 %33 = OpConstantComposite %4 %32 %32 %32 %32 %34 = OpConstant %5 0 %35 = OpConstantComposite %6 %34 %34 %34 %34 diff --git a/naga/tests/out/spv/wgsl-functions-optimized-by-capability.spvasm b/naga/tests/out/spv/wgsl-functions-optimized-by-capability.spvasm index 00fc02f9f8b..011a5e39e34 100644 --- a/naga/tests/out/spv/wgsl-functions-optimized-by-capability.spvasm +++ b/naga/tests/out/spv/wgsl-functions-optimized-by-capability.spvasm @@ -3,8 +3,8 @@ ; Generator: rspirv ; Bound: 30 OpCapability Shader -OpCapability DotProductKHR -OpCapability DotProductInput4x8BitPackedKHR +OpCapability DotProduct +OpCapability DotProductInput4x8BitPacked OpExtension "SPV_KHR_integer_dot_product" %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 @@ -27,14 +27,14 @@ OpExecutionMode %26 LocalSize 1 1 1 %4 = OpLabel OpBranch %15 %15 = OpLabel -%17 = OpSDotKHR %16 %7 %8 PackedVectorFormat4x8BitKHR -%18 = OpUDotKHR %3 %9 %10 PackedVectorFormat4x8BitKHR +%17 = OpSDot %16 %7 %8 PackedVectorFormat4x8Bit +%18 = OpUDot %3 %9 %10 PackedVectorFormat4x8Bit %19 = OpIAdd %3 %11 %18 %20 = OpIAdd %3 %12 %18 -%21 = OpSDotKHR %16 %19 %20 PackedVectorFormat4x8BitKHR +%21 = OpSDot %16 %19 %20 PackedVectorFormat4x8Bit %22 = OpIAdd %3 %13 %18 %23 = OpIAdd %3 %14 %18 -%24 = OpUDotKHR %3 %22 %23 PackedVectorFormat4x8BitKHR +%24 = OpUDot %3 %22 %23 PackedVectorFormat4x8Bit OpReturnValue %24 OpFunctionEnd %26 = OpFunction %2 None %27 diff --git a/naga/tests/out/spv/wgsl-functions-optimized-by-version.spvasm b/naga/tests/out/spv/wgsl-functions-optimized-by-version.spvasm index 0c77fbda039..46aa7520ca1 100644 --- a/naga/tests/out/spv/wgsl-functions-optimized-by-version.spvasm +++ b/naga/tests/out/spv/wgsl-functions-optimized-by-version.spvasm @@ -3,8 +3,8 @@ ; Generator: rspirv ; Bound: 30 OpCapability Shader -OpCapability DotProductKHR -OpCapability DotProductInput4x8BitPackedKHR +OpCapability DotProduct +OpCapability DotProductInput4x8BitPacked %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 OpEntryPoint GLCompute %26 "main" @@ -26,14 +26,14 @@ OpExecutionMode %26 LocalSize 1 1 1 %4 = OpLabel OpBranch %15 %15 = OpLabel -%17 = OpSDotKHR %16 %7 %8 PackedVectorFormat4x8BitKHR -%18 = OpUDotKHR %3 %9 %10 PackedVectorFormat4x8BitKHR +%17 = OpSDot %16 %7 %8 PackedVectorFormat4x8Bit +%18 = OpUDot %3 %9 %10 PackedVectorFormat4x8Bit %19 = OpIAdd %3 %11 %18 %20 = OpIAdd %3 %12 %18 -%21 = OpSDotKHR %16 %19 %20 PackedVectorFormat4x8BitKHR +%21 = OpSDot %16 %19 %20 PackedVectorFormat4x8Bit %22 = OpIAdd %3 %13 %18 %23 = OpIAdd %3 %14 %18 -%24 = OpUDotKHR %3 %22 %23 PackedVectorFormat4x8BitKHR +%24 = OpUDot %3 %22 %23 PackedVectorFormat4x8Bit OpReturnValue %24 OpFunctionEnd %26 = OpFunction %2 None %27 diff --git a/naga/tests/out/spv/wgsl-functions.spvasm b/naga/tests/out/spv/wgsl-functions.spvasm index 35585e2a6c6..a84e322ae74 100644 --- a/naga/tests/out/spv/wgsl-functions.spvasm +++ b/naga/tests/out/spv/wgsl-functions.spvasm @@ -3,8 +3,8 @@ ; Generator: rspirv ; Bound: 95 OpCapability Shader -OpCapability DotProductKHR -OpCapability DotProductInput4x8BitPackedKHR +OpCapability DotProduct +OpCapability DotProductInput4x8BitPacked OpExtension "SPV_KHR_integer_dot_product" %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 @@ -16,7 +16,7 @@ OpExecutionMode %89 LocalSize 1 1 1 %5 = OpTypeInt 32 1 %6 = OpTypeInt 32 0 %9 = OpTypeFunction %3 -%10 = OpConstant %4 2.0 +%10 = OpConstant %4 2 %11 = OpConstantComposite %3 %10 %10 %12 = OpConstant %4 0.5 %13 = OpConstantComposite %3 %12 %12 @@ -96,14 +96,14 @@ OpFunctionEnd %69 = OpLabel OpBranch %79 %79 = OpLabel -%80 = OpSDotKHR %5 %22 %72 PackedVectorFormat4x8BitKHR -%81 = OpUDotKHR %6 %73 %74 PackedVectorFormat4x8BitKHR +%80 = OpSDot %5 %22 %72 PackedVectorFormat4x8Bit +%81 = OpUDot %6 %73 %74 PackedVectorFormat4x8Bit %82 = OpIAdd %6 %75 %81 %83 = OpIAdd %6 %76 %81 -%84 = OpSDotKHR %5 %82 %83 PackedVectorFormat4x8BitKHR +%84 = OpSDot %5 %82 %83 PackedVectorFormat4x8Bit %85 = OpIAdd %6 %77 %81 %86 = OpIAdd %6 %78 %81 -%87 = OpUDotKHR %6 %85 %86 PackedVectorFormat4x8BitKHR +%87 = OpUDot %6 %85 %86 PackedVectorFormat4x8Bit OpReturnValue %87 OpFunctionEnd %89 = OpFunction %2 None %90 diff --git a/naga/tests/out/spv/wgsl-globals.spvasm b/naga/tests/out/spv/wgsl-globals.spvasm index 5cf31f80766..8feae9610ce 100644 --- a/naga/tests/out/spv/wgsl-globals.spvasm +++ b/naga/tests/out/spv/wgsl-globals.spvasm @@ -106,11 +106,11 @@ OpDecorate %116 BuiltIn LocalInvocationId %58 = OpTypeFunction %2 %59 = OpTypePointer StorageBuffer %9 %60 = OpConstant %7 0 -%62 = OpConstant %4 1.0 +%62 = OpConstant %4 1 %63 = OpConstantComposite %8 %62 %62 %62 %64 = OpConstant %23 1 -%65 = OpConstant %4 2.0 -%66 = OpConstant %4 3.0 +%65 = OpConstant %4 2 +%66 = OpConstant %4 3 %67 = OpConstantNull %24 %69 = OpTypePointer Function %23 %71 = OpTypePointer StorageBuffer %8 @@ -121,7 +121,7 @@ OpDecorate %116 BuiltIn LocalInvocationId %101 = OpTypePointer Uniform %15 %103 = OpTypePointer Uniform %19 %105 = OpTypePointer Uniform %22 -%107 = OpConstant %4 4.0 +%107 = OpConstant %4 4 %109 = OpTypePointer Function %4 %111 = OpTypePointer Function %3 %113 = OpConstantNull %5 diff --git a/naga/tests/out/spv/wgsl-image.spvasm b/naga/tests/out/spv/wgsl-image.spvasm index 25681afe888..541fb1f5e64 100644 --- a/naga/tests/out/spv/wgsl-image.spvasm +++ b/naga/tests/out/spv/wgsl-image.spvasm @@ -405,8 +405,8 @@ OpDecorate %549 Location 0 %117 = OpTypeVector %5 4 %132 = OpTypeVector %15 3 %195 = OpVariable %94 Input -%212 = OpConstant %8 0.0 -%213 = OpConstant %8 4294967000.0 +%212 = OpConstant %8 0 +%213 = OpConstant %8 4294967000 %219 = OpTypePointer Output %24 %218 = OpVariable %219 Output %229 = OpConstant %5 0 @@ -420,12 +420,12 @@ OpDecorate %549 Location 0 %314 = OpConstant %15 3 %315 = OpConstantComposite %14 %314 %88 %316 = OpConstant %8 2.3 -%317 = OpConstant %8 2.0 +%317 = OpConstant %8 2 %319 = OpTypePointer Function %24 %320 = OpConstantNull %24 %322 = OpTypeSampledImage %16 %327 = OpTypeSampledImage %17 -%351 = OpConstant %8 1.0 +%351 = OpConstant %8 1 %352 = OpConstantComposite %310 %351 %351 %359 = OpTypeSampledImage %19 %420 = OpTypeSampledImage %21 diff --git a/naga/tests/out/spv/wgsl-index-by-value.spvasm b/naga/tests/out/spv/wgsl-index-by-value.spvasm index 09fedc4d676..e9ed297e2bf 100644 --- a/naga/tests/out/spv/wgsl-index-by-value.spvasm +++ b/naga/tests/out/spv/wgsl-index-by-value.spvasm @@ -36,10 +36,10 @@ OpDecorate %77 BuiltIn Position %36 = OpConstantComposite %9 %32 %35 %38 = OpTypePointer Function %9 %46 = OpTypeFunction %10 %3 %3 -%47 = OpConstant %10 1.0 -%48 = OpConstant %10 2.0 -%49 = OpConstant %10 3.0 -%50 = OpConstant %10 4.0 +%47 = OpConstant %10 1 +%48 = OpConstant %10 2 +%49 = OpConstant %10 3 +%50 = OpConstant %10 4 %51 = OpConstantComposite %12 %47 %48 %52 = OpConstantComposite %12 %49 %50 %53 = OpConstantComposite %11 %51 %52 diff --git a/naga/tests/out/spv/wgsl-int64.spvasm b/naga/tests/out/spv/wgsl-int64.spvasm index 141a95be586..c35098f7bd2 100644 --- a/naga/tests/out/spv/wgsl-int64.spvasm +++ b/naga/tests/out/spv/wgsl-int64.spvasm @@ -99,8 +99,8 @@ OpMemberDecorate %36 0 Offset 0 %78 = OpTypePointer Uniform %6 %79 = OpConstant %5 1 %88 = OpTypePointer Uniform %7 -%94 = OpConstant %7 -9.223372e18 -%95 = OpConstant %7 9.2233715e18 +%94 = OpConstant %7 -9223372000000000000 +%95 = OpConstant %7 9223371500000000000 %100 = OpTypePointer Uniform %3 %101 = OpConstant %5 7 %108 = OpTypePointer Uniform %4 @@ -128,8 +128,8 @@ OpMemberDecorate %36 0 Offset 0 %230 = OpConstant %4 18446744073709551615 %231 = OpConstant %4 5 %233 = OpTypePointer Function %4 -%264 = OpConstant %7 0.0 -%265 = OpConstant %7 1.8446743e19 +%264 = OpConstant %7 0 +%265 = OpConstant %7 18446743000000000000 %299 = OpTypePointer StorageBuffer %4 %306 = OpTypePointer StorageBuffer %8 %313 = OpTypePointer StorageBuffer %9 diff --git a/naga/tests/out/spv/wgsl-interface.fragment.spvasm b/naga/tests/out/spv/wgsl-interface.fragment.spvasm index 891b10d863d..e78d69121f3 100644 --- a/naga/tests/out/spv/wgsl-interface.fragment.spvasm +++ b/naga/tests/out/spv/wgsl-interface.fragment.spvasm @@ -56,8 +56,8 @@ OpDecorate %34 Location 0 %32 = OpVariable %33 Output %34 = OpVariable %31 Output %36 = OpTypeFunction %2 -%37 = OpConstant %3 0.0 -%38 = OpConstant %3 1.0 +%37 = OpConstant %3 0 +%38 = OpConstant %3 1 %35 = OpFunction %2 None %36 %14 = OpLabel %18 = OpLoad %4 %16 diff --git a/naga/tests/out/spv/wgsl-interface.vertex.spvasm b/naga/tests/out/spv/wgsl-interface.vertex.spvasm index 63ca57fa7d6..fa11c5b89f7 100644 --- a/naga/tests/out/spv/wgsl-interface.vertex.spvasm +++ b/naga/tests/out/spv/wgsl-interface.vertex.spvasm @@ -42,7 +42,7 @@ OpDecorate %26 BuiltIn PointSize %25 = OpTypePointer Output %3 %24 = OpVariable %25 Output %26 = OpVariable %25 Output -%27 = OpConstant %3 1.0 +%27 = OpConstant %3 1 %29 = OpTypeFunction %2 %30 = OpConstantComposite %4 %27 %27 %27 %27 %28 = OpFunction %2 None %29 diff --git a/naga/tests/out/spv/wgsl-interface.vertex_two_structs.spvasm b/naga/tests/out/spv/wgsl-interface.vertex_two_structs.spvasm index cad89cc551a..f83a5a624b3 100644 --- a/naga/tests/out/spv/wgsl-interface.vertex_two_structs.spvasm +++ b/naga/tests/out/spv/wgsl-interface.vertex_two_structs.spvasm @@ -38,10 +38,10 @@ OpDecorate %24 BuiltIn PointSize %22 = OpVariable %23 Output %25 = OpTypePointer Output %3 %24 = OpVariable %25 Output -%26 = OpConstant %3 1.0 +%26 = OpConstant %3 1 %28 = OpTypeFunction %2 %29 = OpConstant %6 2 -%30 = OpConstant %3 0.0 +%30 = OpConstant %3 0 %32 = OpTypePointer Function %6 %27 = OpFunction %2 None %28 %14 = OpLabel diff --git a/naga/tests/out/spv/wgsl-interpolate.spvasm b/naga/tests/out/spv/wgsl-interpolate.spvasm index ce0a9211522..91af2f3fe2c 100644 --- a/naga/tests/out/spv/wgsl-interpolate.spvasm +++ b/naga/tests/out/spv/wgsl-interpolate.spvasm @@ -176,36 +176,36 @@ OpDecorate %135 Location 11 %26 = OpVariable %18 Output %27 = OpVariable %18 Output %28 = OpVariable %18 Output -%29 = OpConstant %4 1.0 +%29 = OpConstant %4 1 %31 = OpTypeFunction %2 -%32 = OpConstant %4 2.0 -%33 = OpConstant %4 4.0 -%34 = OpConstant %4 5.0 -%35 = OpConstant %4 6.0 +%32 = OpConstant %4 2 +%33 = OpConstant %4 4 +%34 = OpConstant %4 5 +%35 = OpConstant %4 6 %36 = OpConstantComposite %5 %32 %33 %34 %35 %37 = OpConstant %6 8 %38 = OpConstant %6 9 %39 = OpConstant %6 10 -%40 = OpConstant %4 27.0 -%41 = OpConstant %4 64.0 -%42 = OpConstant %4 125.0 +%40 = OpConstant %4 27 +%41 = OpConstant %4 64 +%42 = OpConstant %4 125 %43 = OpConstantComposite %7 %41 %42 -%44 = OpConstant %4 216.0 -%45 = OpConstant %4 343.0 -%46 = OpConstant %4 512.0 +%44 = OpConstant %4 216 +%45 = OpConstant %4 343 +%46 = OpConstant %4 512 %47 = OpConstantComposite %8 %44 %45 %46 -%48 = OpConstant %4 255.0 -%49 = OpConstant %4 511.0 -%50 = OpConstant %4 1024.0 +%48 = OpConstant %4 255 +%49 = OpConstant %4 511 +%50 = OpConstant %4 1024 %51 = OpConstantComposite %8 %48 %49 %50 -%52 = OpConstant %4 729.0 -%53 = OpConstant %4 1000.0 -%54 = OpConstant %4 1331.0 -%55 = OpConstant %4 1728.0 +%52 = OpConstant %4 729 +%53 = OpConstant %4 1000 +%54 = OpConstant %4 1331 +%55 = OpConstant %4 1728 %56 = OpConstantComposite %5 %52 %53 %54 %55 -%57 = OpConstant %4 2197.0 -%58 = OpConstant %4 2744.0 -%59 = OpConstant %4 2812.0 +%57 = OpConstant %4 2197 +%58 = OpConstant %4 2744 +%59 = OpConstant %4 2812 %61 = OpTypePointer Function %9 %62 = OpConstantNull %9 %64 = OpTypePointer Function %5 diff --git a/naga/tests/out/spv/wgsl-interpolate_compat.spvasm b/naga/tests/out/spv/wgsl-interpolate_compat.spvasm index f6c72a053ef..f09a39d5a52 100644 --- a/naga/tests/out/spv/wgsl-interpolate_compat.spvasm +++ b/naga/tests/out/spv/wgsl-interpolate_compat.spvasm @@ -169,35 +169,35 @@ OpDecorate %129 Location 11 %25 = OpVariable %17 Output %26 = OpVariable %17 Output %27 = OpVariable %17 Output -%28 = OpConstant %4 1.0 +%28 = OpConstant %4 1 %30 = OpTypeFunction %2 -%31 = OpConstant %4 2.0 -%32 = OpConstant %4 4.0 -%33 = OpConstant %4 5.0 -%34 = OpConstant %4 6.0 +%31 = OpConstant %4 2 +%32 = OpConstant %4 4 +%33 = OpConstant %4 5 +%34 = OpConstant %4 6 %35 = OpConstantComposite %5 %31 %32 %33 %34 %36 = OpConstant %6 8 %37 = OpConstant %6 10 -%38 = OpConstant %4 27.0 -%39 = OpConstant %4 64.0 -%40 = OpConstant %4 125.0 +%38 = OpConstant %4 27 +%39 = OpConstant %4 64 +%40 = OpConstant %4 125 %41 = OpConstantComposite %7 %39 %40 -%42 = OpConstant %4 216.0 -%43 = OpConstant %4 343.0 -%44 = OpConstant %4 512.0 +%42 = OpConstant %4 216 +%43 = OpConstant %4 343 +%44 = OpConstant %4 512 %45 = OpConstantComposite %8 %42 %43 %44 -%46 = OpConstant %4 255.0 -%47 = OpConstant %4 511.0 -%48 = OpConstant %4 1024.0 +%46 = OpConstant %4 255 +%47 = OpConstant %4 511 +%48 = OpConstant %4 1024 %49 = OpConstantComposite %8 %46 %47 %48 -%50 = OpConstant %4 729.0 -%51 = OpConstant %4 1000.0 -%52 = OpConstant %4 1331.0 -%53 = OpConstant %4 1728.0 +%50 = OpConstant %4 729 +%51 = OpConstant %4 1000 +%52 = OpConstant %4 1331 +%53 = OpConstant %4 1728 %54 = OpConstantComposite %5 %50 %51 %52 %53 -%55 = OpConstant %4 2197.0 -%56 = OpConstant %4 2744.0 -%57 = OpConstant %4 2812.0 +%55 = OpConstant %4 2197 +%56 = OpConstant %4 2744 +%57 = OpConstant %4 2812 %59 = OpTypePointer Function %9 %60 = OpConstantNull %9 %62 = OpTypePointer Function %5 diff --git a/naga/tests/out/spv/wgsl-math-functions.spvasm b/naga/tests/out/spv/wgsl-math-functions.spvasm index a85644d4548..9aba53bc248 100644 --- a/naga/tests/out/spv/wgsl-math-functions.spvasm +++ b/naga/tests/out/spv/wgsl-math-functions.spvasm @@ -33,12 +33,12 @@ OpMemberDecorate %15 1 Offset 16 %15 = OpTypeStruct %4 %6 %16 = OpTypeVector %3 3 %19 = OpTypeFunction %2 -%20 = OpConstant %3 1.0 -%21 = OpConstant %3 0.0 +%20 = OpConstant %3 1 +%21 = OpConstant %3 0 %22 = OpConstantComposite %4 %21 %21 %21 %21 %23 = OpConstant %5 -1 %24 = OpConstantComposite %6 %23 %23 %23 %23 -%25 = OpConstant %3 -1.0 +%25 = OpConstant %3 -1 %26 = OpConstantComposite %4 %25 %25 %25 %25 %27 = OpConstantNull %7 %28 = OpConstant %9 4294967295 @@ -54,7 +54,7 @@ OpMemberDecorate %15 1 Offset 16 %38 = OpConstant %9 31 %39 = OpConstantComposite %8 %38 %38 %40 = OpConstant %5 2 -%41 = OpConstant %3 2.0 +%41 = OpConstant %3 2 %42 = OpConstantComposite %10 %20 %41 %43 = OpConstant %5 3 %44 = OpConstant %5 4 diff --git a/naga/tests/out/spv/wgsl-operators.spvasm b/naga/tests/out/spv/wgsl-operators.spvasm index cf24cc8102f..9ffe1ae1ea2 100644 --- a/naga/tests/out/spv/wgsl-operators.spvasm +++ b/naga/tests/out/spv/wgsl-operators.spvasm @@ -21,9 +21,9 @@ OpDecorate %513 BuiltIn WorkgroupId %12 = OpTypeMatrix %8 4 %13 = OpTypeMatrix %4 3 %14 = OpTypeVector %5 3 -%15 = OpConstant %3 1.0 +%15 = OpConstant %3 1 %16 = OpConstantComposite %4 %15 %15 %15 %15 -%17 = OpConstant %3 0.0 +%17 = OpConstant %3 0 %18 = OpConstantComposite %4 %17 %17 %17 %17 %19 = OpConstant %3 0.5 %20 = OpConstantComposite %4 %19 %19 %19 %19 @@ -44,17 +44,17 @@ OpDecorate %513 BuiltIn WorkgroupId %60 = OpConstantComposite %6 %58 %58 %58 %58 %65 = OpConstantComposite %6 %21 %21 %21 %21 %72 = OpTypeFunction %4 %3 %5 -%73 = OpConstant %3 2.0 +%73 = OpConstant %3 2 %74 = OpConstantComposite %7 %73 %73 -%75 = OpConstant %3 4.0 +%75 = OpConstant %3 4 %76 = OpConstantComposite %7 %75 %75 -%77 = OpConstant %3 8.0 +%77 = OpConstant %3 8 %78 = OpConstantComposite %7 %77 %77 %79 = OpConstant %5 2 %80 = OpConstantComposite %6 %79 %79 %79 %79 %93 = OpTypeFunction %7 %94 = OpConstantComposite %7 %15 %15 -%95 = OpConstant %3 3.0 +%95 = OpConstant %3 3 %96 = OpConstantComposite %7 %95 %95 %98 = OpTypePointer Function %7 %110 = OpTypeFunction %8 %8 diff --git a/naga/tests/out/spv/wgsl-overrides-ray-query.main.spvasm b/naga/tests/out/spv/wgsl-overrides-ray-query.main.spvasm index 4ceae75e596..34a8df87711 100644 --- a/naga/tests/out/spv/wgsl-overrides-ray-query.main.spvasm +++ b/naga/tests/out/spv/wgsl-overrides-ray-query.main.spvasm @@ -19,24 +19,24 @@ OpDecorate %10 DescriptorSet 0 OpDecorate %10 Binding 0 %2 = OpTypeVoid %3 = OpTypeFloat 32 -%4 = OpTypeAccelerationStructureNV +%4 = OpTypeAccelerationStructureKHR %5 = OpTypeRayQueryKHR %6 = OpTypeInt 32 0 %7 = OpTypeVector %3 3 %8 = OpTypeStruct %6 %6 %3 %3 %7 %7 -%9 = OpConstant %3 2.0 +%9 = OpConstant %3 2 %11 = OpTypePointer UniformConstant %4 %10 = OpVariable %11 UniformConstant %14 = OpTypeFunction %2 %16 = OpConstant %6 4 %17 = OpConstant %6 255 -%18 = OpConstant %3 34.0 -%19 = OpConstant %3 38.0 -%20 = OpConstant %3 46.0 +%18 = OpConstant %3 34 +%19 = OpConstant %3 38 +%20 = OpConstant %3 46 %21 = OpConstantComposite %7 %20 %20 %20 -%22 = OpConstant %3 58.0 -%23 = OpConstant %3 62.0 -%24 = OpConstant %3 74.0 +%22 = OpConstant %3 58 +%23 = OpConstant %3 62 +%24 = OpConstant %3 74 %25 = OpConstantComposite %7 %22 %23 %24 %26 = OpConstantComposite %8 %16 %17 %18 %19 %21 %25 %28 = OpTypePointer Function %5 diff --git a/naga/tests/out/spv/wgsl-overrides.main.spvasm b/naga/tests/out/spv/wgsl-overrides.main.spvasm index a685272479e..3b9eaca2497 100644 --- a/naga/tests/out/spv/wgsl-overrides.main.spvasm +++ b/naga/tests/out/spv/wgsl-overrides.main.spvasm @@ -13,21 +13,21 @@ OpExecutionMode %22 LocalSize 1 1 1 %5 = OpTypeInt 32 0 %6 = OpConstantTrue %3 %7 = OpConstant %4 2.3 -%8 = OpConstant %4 0.0 +%8 = OpConstant %4 0 %9 = OpConstantFalse %3 %10 = OpConstant %4 1.1 -%11 = OpConstant %4 2.0 +%11 = OpConstant %4 2 %12 = OpConstant %4 4.6 %13 = OpConstant %4 2.718 %14 = OpConstant %5 0 -%15 = OpConstant %4 10.0 -%16 = OpConstant %4 11.0 +%15 = OpConstant %4 10 +%16 = OpConstant %4 11 %18 = OpTypePointer Private %4 %17 = OpVariable %18 Private %16 %20 = OpConstantNull %4 %19 = OpVariable %18 Private %20 %23 = OpTypeFunction %2 -%24 = OpConstant %4 23.0 +%24 = OpConstant %4 23 %26 = OpTypePointer Function %4 %28 = OpTypePointer Function %3 %29 = OpConstantNull %3 diff --git a/naga/tests/out/spv/wgsl-padding.spvasm b/naga/tests/out/spv/wgsl-padding.spvasm index 2df29c96d4b..615965cc3e4 100644 --- a/naga/tests/out/spv/wgsl-padding.spvasm +++ b/naga/tests/out/spv/wgsl-padding.spvasm @@ -107,7 +107,7 @@ OpDecorate %25 BuiltIn Position %30 = OpConstant %10 0 %32 = OpTypePointer Uniform %11 %34 = OpTypePointer Uniform %13 -%36 = OpConstant %4 1.0 +%36 = OpConstant %4 1 %37 = OpConstantComposite %14 %36 %36 %36 %36 %39 = OpTypePointer Uniform %4 %40 = OpConstant %10 1 diff --git a/naga/tests/out/spv/wgsl-pointers.spvasm b/naga/tests/out/spv/wgsl-pointers.spvasm index 779b01b8af9..08867c95384 100644 --- a/naga/tests/out/spv/wgsl-pointers.spvasm +++ b/naga/tests/out/spv/wgsl-pointers.spvasm @@ -71,7 +71,7 @@ OpDecorate %11 Binding 0 %12 = OpTypePointer StorageBuffer %9 %11 = OpVariable %12 StorageBuffer %15 = OpTypeFunction %2 -%16 = OpConstant %6 10.0 +%16 = OpConstant %6 10 %17 = OpConstantComposite %5 %16 %16 %19 = OpTypePointer Function %4 %20 = OpConstantNull %4 diff --git a/naga/tests/out/spv/wgsl-policy-mix.spvasm b/naga/tests/out/spv/wgsl-policy-mix.spvasm index 28e8d92226f..8d9209d7b35 100644 --- a/naga/tests/out/spv/wgsl-policy-mix.spvasm +++ b/naga/tests/out/spv/wgsl-policy-mix.spvasm @@ -120,8 +120,8 @@ OpDecorate %115 BuiltIn LocalInvocationId %42 = OpConstant %8 0 %44 = OpTypePointer Uniform %12 %47 = OpConstant %4 0.707 -%48 = OpConstant %4 0.0 -%49 = OpConstant %4 1.0 +%48 = OpConstant %4 0 +%49 = OpConstant %4 1 %50 = OpConstantComposite %5 %47 %48 %48 %49 %51 = OpConstantComposite %5 %48 %47 %48 %49 %52 = OpConstantComposite %20 %50 %51 diff --git a/naga/tests/out/spv/wgsl-quad.spvasm b/naga/tests/out/spv/wgsl-quad.spvasm index a3532fb16e0..307fa304926 100644 --- a/naga/tests/out/spv/wgsl-quad.spvasm +++ b/naga/tests/out/spv/wgsl-quad.spvasm @@ -97,8 +97,8 @@ OpDecorate %60 Location 0 %24 = OpTypePointer Output %6 %23 = OpVariable %24 Output %26 = OpTypeFunction %2 -%27 = OpConstant %4 0.0 -%28 = OpConstant %4 1.0 +%27 = OpConstant %4 0 +%28 = OpConstant %4 1 %35 = OpTypePointer Output %4 %37 = OpTypeInt 32 0 %36 = OpConstant %37 1 diff --git a/naga/tests/out/spv/wgsl-ray-query.spvasm b/naga/tests/out/spv/wgsl-ray-query.spvasm index 138efe2c352..d49ae40b2f8 100644 --- a/naga/tests/out/spv/wgsl-ray-query.spvasm +++ b/naga/tests/out/spv/wgsl-ray-query.spvasm @@ -43,7 +43,7 @@ OpMemberDecorate %18 0 Offset 0 %2 = OpTypeVoid %3 = OpTypeFloat 32 %4 = OpTypeVector %3 3 -%5 = OpTypeAccelerationStructureNV +%5 = OpTypeAccelerationStructureKHR %6 = OpTypeInt 32 0 %7 = OpTypeVector %3 2 %8 = OpTypeBool @@ -62,7 +62,7 @@ OpMemberDecorate %18 0 Offset 0 %27 = OpConstant %6 4 %28 = OpConstant %6 255 %29 = OpConstant %3 0.1 -%30 = OpConstant %3 100.0 +%30 = OpConstant %3 100 %32 = OpTypePointer Function %11 %45 = OpTypeVector %6 2 %46 = OpTypePointer Function %45 @@ -89,9 +89,9 @@ OpMemberDecorate %18 0 Offset 0 %113 = OpConstant %6 7 %115 = OpConstant %6 8 %123 = OpTypeFunction %4 %4 %10 -%124 = OpConstant %3 1.0 +%124 = OpConstant %3 1 %125 = OpConstant %3 2.4 -%126 = OpConstant %3 0.0 +%126 = OpConstant %3 0 %141 = OpTypeFunction %2 %143 = OpTypePointer StorageBuffer %13 %145 = OpConstantComposite %4 %126 %126 %126 @@ -99,7 +99,7 @@ OpMemberDecorate %18 0 Offset 0 %149 = OpTypePointer StorageBuffer %6 %154 = OpTypePointer StorageBuffer %4 %162 = OpConstantComposite %12 %27 %28 %29 %30 %145 %146 -%163 = OpConstant %3 10.0 +%163 = OpConstant %3 10 %76 = OpFunction %10 None %75 %78 = OpFunctionParameter %32 %79 = OpLabel diff --git a/naga/tests/out/spv/wgsl-select.spvasm b/naga/tests/out/spv/wgsl-select.spvasm index d0011c464f8..9725ab38beb 100644 --- a/naga/tests/out/spv/wgsl-select.spvasm +++ b/naga/tests/out/spv/wgsl-select.spvasm @@ -13,11 +13,11 @@ OpExecutionMode %8 LocalSize 1 1 1 %6 = OpTypeInt 32 1 %5 = OpTypeVector %6 2 %9 = OpTypeFunction %2 -%10 = OpConstant %4 1.0 +%10 = OpConstant %4 1 %11 = OpConstant %6 1 %12 = OpConstant %6 2 %13 = OpConstantComposite %5 %11 %12 -%14 = OpConstant %4 0.0 +%14 = OpConstant %4 0 %15 = OpConstantComposite %3 %10 %14 %16 = OpConstantComposite %3 %14 %10 %18 = OpTypePointer Function %5 diff --git a/naga/tests/out/spv/wgsl-separate-entry-points.fragment.spvasm b/naga/tests/out/spv/wgsl-separate-entry-points.fragment.spvasm index e29ce8f15db..ae58bae874f 100644 --- a/naga/tests/out/spv/wgsl-separate-entry-points.fragment.spvasm +++ b/naga/tests/out/spv/wgsl-separate-entry-points.fragment.spvasm @@ -12,7 +12,7 @@ OpDecorate %14 Location 0 %4 = OpTypeFloat 32 %3 = OpTypeVector %4 4 %7 = OpTypeFunction %2 -%8 = OpConstant %4 0.0 +%8 = OpConstant %4 0 %15 = OpTypePointer Output %3 %14 = OpVariable %15 Output %17 = OpConstantNull %3 diff --git a/naga/tests/out/spv/wgsl-shadow.spvasm b/naga/tests/out/spv/wgsl-shadow.spvasm index ea131ae6d03..1360528131a 100644 --- a/naga/tests/out/spv/wgsl-shadow.spvasm +++ b/naga/tests/out/spv/wgsl-shadow.spvasm @@ -267,8 +267,8 @@ OpDecorate %227 Location 0 %40 = OpTypePointer UniformConstant %21 %39 = OpVariable %40 UniformConstant %45 = OpTypeFunction %4 %7 %6 -%48 = OpConstant %4 0.0 -%49 = OpConstant %4 1.0 +%48 = OpConstant %4 0 +%49 = OpConstant %4 1 %50 = OpConstant %4 0.5 %51 = OpConstant %4 -0.5 %52 = OpConstantComposite %22 %50 %51 diff --git a/naga/tests/out/spv/wgsl-skybox.spvasm b/naga/tests/out/spv/wgsl-skybox.spvasm index 7bc7b30f6da..f3e4be2cc22 100644 --- a/naga/tests/out/spv/wgsl-skybox.spvasm +++ b/naga/tests/out/spv/wgsl-skybox.spvasm @@ -65,9 +65,9 @@ OpDecorate %105 Location 0 %48 = OpTypePointer Uniform %8 %49 = OpConstant %9 0 %51 = OpConstant %10 2 -%52 = OpConstant %4 4.0 -%53 = OpConstant %4 1.0 -%54 = OpConstant %4 0.0 +%52 = OpConstant %4 4 +%53 = OpConstant %4 1 +%54 = OpConstant %4 0 %56 = OpTypePointer Function %10 %57 = OpConstantNull %10 %59 = OpConstantNull %10 diff --git a/naga/tests/out/spv/wgsl-storage-textures.spvasm b/naga/tests/out/spv/wgsl-storage-textures.spvasm index c043c2b94e2..167d5f49299 100644 --- a/naga/tests/out/spv/wgsl-storage-textures.spvasm +++ b/naga/tests/out/spv/wgsl-storage-textures.spvasm @@ -48,7 +48,7 @@ OpDecorate %15 Binding 2 %24 = OpTypeVector %22 2 %25 = OpConstantComposite %24 %23 %23 %27 = OpTypeVector %4 4 -%36 = OpConstant %4 0.0 +%36 = OpConstant %4 0 %37 = OpConstantComposite %27 %36 %36 %36 %36 %17 = OpFunction %2 None %18 %16 = OpLabel diff --git a/naga/tests/out/spv/wgsl-struct-layout.spvasm b/naga/tests/out/spv/wgsl-struct-layout.spvasm index 42899de9b58..31611dad6a9 100644 --- a/naga/tests/out/spv/wgsl-struct-layout.spvasm +++ b/naga/tests/out/spv/wgsl-struct-layout.spvasm @@ -76,7 +76,7 @@ OpDecorate %77 BuiltIn Position %29 = OpTypePointer Output %6 %28 = OpVariable %29 Output %31 = OpTypeFunction %2 -%32 = OpConstant %3 0.0 +%32 = OpConstant %3 0 %33 = OpConstantComposite %6 %32 %32 %32 %32 %37 = OpVariable %23 Input %39 = OpVariable %26 Input diff --git a/naga/tests/out/spv/wgsl-texture-arg.spvasm b/naga/tests/out/spv/wgsl-texture-arg.spvasm index ebb110e8fd8..23bd0ce2977 100644 --- a/naga/tests/out/spv/wgsl-texture-arg.spvasm +++ b/naga/tests/out/spv/wgsl-texture-arg.spvasm @@ -44,7 +44,7 @@ OpDecorate %27 Location 0 %12 = OpTypePointer UniformConstant %6 %11 = OpVariable %12 UniformConstant %19 = OpTypeFunction %7 %10 %12 -%20 = OpConstant %5 0.0 +%20 = OpConstant %5 0 %21 = OpConstantComposite %8 %20 %20 %23 = OpTypeSampledImage %4 %28 = OpTypePointer Output %7 diff --git a/naga/tests/out/spv/wgsl-type-inference.spvasm b/naga/tests/out/spv/wgsl-type-inference.spvasm index adcaa8094e6..d56e1fdac6b 100644 --- a/naga/tests/out/spv/wgsl-type-inference.spvasm +++ b/naga/tests/out/spv/wgsl-type-inference.spvasm @@ -15,11 +15,11 @@ OpExecutionMode %18 LocalSize 1 1 1 %8 = OpTypeVector %4 2 %7 = OpTypeMatrix %8 2 %9 = OpConstant %3 1 -%10 = OpConstant %4 1.0 +%10 = OpConstant %4 1 %11 = OpConstantNull %6 %12 = OpConstant %5 1 %13 = OpConstantComposite %6 %12 %12 %12 %12 -%14 = OpConstant %4 0.0 +%14 = OpConstant %4 0 %15 = OpConstantComposite %8 %14 %14 %16 = OpConstantComposite %7 %15 %15 %19 = OpTypeFunction %2