diff --git a/src/tint/intrinsics.def b/src/tint/intrinsics.def
index b533770a17..54db7f58b8 100644
--- a/src/tint/intrinsics.def
+++ b/src/tint/intrinsics.def
@@ -148,10 +148,10 @@ type texture_storage_2d_array<F: texel_format, A: access>
 type texture_storage_3d<F: texel_format, A: access>
 type texture_external
 
-type __modf_result
-@display("__modf_result_vec{N}") type __modf_result_vec<N: num>
-type __frexp_result
-@display("__frexp_result_vec{N}") type __frexp_result_vec<N: num>
+@display("__modf_result_{T}")        type __modf_result<T>
+@display("__modf_result_vec{N}_{T}") type __modf_result_vec<N: num, T>
+@display("__frexp_result_{T}")        type __frexp_result<T>
+@display("__frexp_result_vec{N}_{T}") type __frexp_result_vec<N: num, T>
 
 type __atomic_compare_exchange_result<T>
 
@@ -463,8 +463,8 @@ fn fma<T: f32_f16>(T, T, T) -> T
 fn fma<N: num, T: f32_f16>(vec<N, T>, vec<N, T>, vec<N, T>) -> vec<N, T>
 fn fract<T: f32_f16>(T) -> T
 fn fract<N: num, T: f32_f16>(vec<N, T>) -> vec<N, T>
-fn frexp(f32) -> __frexp_result
-fn frexp<N: num>(vec<N, f32>) -> __frexp_result_vec<N>
+fn frexp<T: f32_f16>(T) -> __frexp_result<T>
+fn frexp<N: num, T: f32_f16>(vec<N, T>) -> __frexp_result_vec<N, T>
 @stage("fragment") fn fwidth(f32) -> f32
 @stage("fragment") fn fwidth<N: num>(vec<N, f32>) -> vec<N, f32>
 @stage("fragment") fn fwidthCoarse(f32) -> f32
@@ -490,8 +490,8 @@ fn min<N: num, T: fiu32_f16>(vec<N, T>, vec<N, T>) -> vec<N, T>
 fn mix<T: f32_f16>(T, T, T) -> T
 fn mix<N: num, T: f32_f16>(vec<N, T>, vec<N, T>, vec<N, T>) -> vec<N, T>
 fn mix<N: num, T: f32_f16>(vec<N, T>, vec<N, T>, T) -> vec<N, T>
-fn modf(f32) -> __modf_result
-fn modf<N: num>(vec<N, f32>) -> __modf_result_vec<N>
+fn modf<T: f32_f16>(T) -> __modf_result<T>
+fn modf<N: num, T: f32_f16>(vec<N, T>) -> __modf_result_vec<N, T>
 fn normalize<N: num, T: f32_f16>(vec<N, T>) -> vec<N, T>
 fn pack2x16float(vec2<f32>) -> u32
 fn pack2x16snorm(vec2<f32>) -> u32
diff --git a/src/tint/resolver/builtin_test.cc b/src/tint/resolver/builtin_test.cc
index 3bc6ecd28c..6046a730f5 100644
--- a/src/tint/resolver/builtin_test.cc
+++ b/src/tint/resolver/builtin_test.cc
@@ -901,8 +901,9 @@ TEST_F(ResolverBuiltinFloatTest, Distance_NoParams) {
 )");
 }
 
-// frexp: (f32) -> __frexp_result, (vecN<f32>) -> __frexp_result_vecN
-TEST_F(ResolverBuiltinFloatTest, FrexpScalar) {
+// frexp: (f32) -> __frexp_result, (vecN<f32>) -> __frexp_result_vecN, (f16) -> __frexp_result_16,
+// (vecN<f16>) -> __frexp_result_vecN_f16
+TEST_F(ResolverBuiltinFloatTest, FrexpScalar_f32) {
     auto* call = Call("frexp", 1_f);
     WrapInFunction(call);
 
@@ -931,7 +932,38 @@ TEST_F(ResolverBuiltinFloatTest, FrexpScalar) {
     EXPECT_EQ(ty->SizeNoPadding(), 8u);
 }
 
-TEST_F(ResolverBuiltinFloatTest, FrexpVector) {
+TEST_F(ResolverBuiltinFloatTest, FrexpScalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", 1_h);
+    WrapInFunction(call);
+
+    EXPECT_TRUE(r()->Resolve()) << r()->error();
+
+    ASSERT_NE(TypeOf(call), nullptr);
+    auto* ty = TypeOf(call)->As<sem::Struct>();
+    ASSERT_NE(ty, nullptr);
+    ASSERT_EQ(ty->Members().size(), 2u);
+
+    auto* sig = ty->Members()[0];
+    EXPECT_TRUE(sig->Type()->Is<sem::F16>());
+    EXPECT_EQ(sig->Offset(), 0u);
+    EXPECT_EQ(sig->Size(), 2u);
+    EXPECT_EQ(sig->Align(), 2u);
+    EXPECT_EQ(sig->Name(), Sym("sig"));
+
+    auto* exp = ty->Members()[1];
+    EXPECT_TRUE(exp->Type()->Is<sem::I32>());
+    EXPECT_EQ(exp->Offset(), 4u);
+    EXPECT_EQ(exp->Size(), 4u);
+    EXPECT_EQ(exp->Align(), 4u);
+    EXPECT_EQ(exp->Name(), Sym("exp"));
+
+    EXPECT_EQ(ty->Size(), 8u);
+    EXPECT_EQ(ty->SizeNoPadding(), 8u);
+}
+
+TEST_F(ResolverBuiltinFloatTest, FrexpVector_f32) {
     auto* call = Call("frexp", vec3<f32>());
     WrapInFunction(call);
 
@@ -964,6 +996,41 @@ TEST_F(ResolverBuiltinFloatTest, FrexpVector) {
     EXPECT_EQ(ty->SizeNoPadding(), 28u);
 }
 
+TEST_F(ResolverBuiltinFloatTest, FrexpVector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", vec3<f16>());
+    WrapInFunction(call);
+
+    EXPECT_TRUE(r()->Resolve()) << r()->error();
+
+    ASSERT_NE(TypeOf(call), nullptr);
+    auto* ty = TypeOf(call)->As<sem::Struct>();
+    ASSERT_NE(ty, nullptr);
+    ASSERT_EQ(ty->Members().size(), 2u);
+
+    auto* sig = ty->Members()[0];
+    ASSERT_TRUE(sig->Type()->Is<sem::Vector>());
+    EXPECT_EQ(sig->Type()->As<sem::Vector>()->Width(), 3u);
+    EXPECT_TRUE(sig->Type()->As<sem::Vector>()->type()->Is<sem::F16>());
+    EXPECT_EQ(sig->Offset(), 0u);
+    EXPECT_EQ(sig->Size(), 6u);
+    EXPECT_EQ(sig->Align(), 8u);
+    EXPECT_EQ(sig->Name(), Sym("sig"));
+
+    auto* exp = ty->Members()[1];
+    ASSERT_TRUE(exp->Type()->Is<sem::Vector>());
+    EXPECT_EQ(exp->Type()->As<sem::Vector>()->Width(), 3u);
+    EXPECT_TRUE(exp->Type()->As<sem::Vector>()->type()->Is<sem::I32>());
+    EXPECT_EQ(exp->Offset(), 16u);
+    EXPECT_EQ(exp->Size(), 12u);
+    EXPECT_EQ(exp->Align(), 16u);
+    EXPECT_EQ(exp->Name(), Sym("exp"));
+
+    EXPECT_EQ(ty->Size(), 32u);
+    EXPECT_EQ(ty->SizeNoPadding(), 28u);
+}
+
 TEST_F(ResolverBuiltinFloatTest, Frexp_Error_FirstParamInt) {
     GlobalVar("v", ty.i32(), ast::StorageClass::kWorkgroup);
     auto* call = Call("frexp", 1_i, AddressOf("v"));
@@ -975,8 +1042,8 @@ TEST_F(ResolverBuiltinFloatTest, Frexp_Error_FirstParamInt) {
               R"(error: no matching call to frexp(i32, ptr<workgroup, i32, read_write>)
 
 2 candidate functions:
-  frexp(f32) -> __frexp_result
-  frexp(vecN<f32>) -> __frexp_result_vecN
+  frexp(T) -> __frexp_result_T  where: T is f32 or f16
+  frexp(vecN<T>) -> __frexp_result_vecN_T  where: T is f32 or f16
 )");
 }
 
@@ -991,8 +1058,8 @@ TEST_F(ResolverBuiltinFloatTest, Frexp_Error_SecondParamFloatPtr) {
               R"(error: no matching call to frexp(f32, ptr<workgroup, f32, read_write>)
 
 2 candidate functions:
-  frexp(f32) -> __frexp_result
-  frexp(vecN<f32>) -> __frexp_result_vecN
+  frexp(T) -> __frexp_result_T  where: T is f32 or f16
+  frexp(vecN<T>) -> __frexp_result_vecN_T  where: T is f32 or f16
 )");
 }
 
@@ -1005,8 +1072,8 @@ TEST_F(ResolverBuiltinFloatTest, Frexp_Error_SecondParamNotAPointer) {
     EXPECT_EQ(r()->error(), R"(error: no matching call to frexp(f32, i32)
 
 2 candidate functions:
-  frexp(f32) -> __frexp_result
-  frexp(vecN<f32>) -> __frexp_result_vecN
+  frexp(T) -> __frexp_result_T  where: T is f32 or f16
+  frexp(vecN<T>) -> __frexp_result_vecN_T  where: T is f32 or f16
 )");
 }
 
@@ -1021,8 +1088,8 @@ TEST_F(ResolverBuiltinFloatTest, Frexp_Error_VectorSizesDontMatch) {
               R"(error: no matching call to frexp(vec2<f32>, ptr<workgroup, vec4<i32>, read_write>)
 
 2 candidate functions:
-  frexp(vecN<f32>) -> __frexp_result_vecN
-  frexp(f32) -> __frexp_result
+  frexp(T) -> __frexp_result_T  where: T is f32 or f16
+  frexp(vecN<T>) -> __frexp_result_vecN_T  where: T is f32 or f16
 )");
 }
 
@@ -1129,8 +1196,9 @@ TEST_F(ResolverBuiltinFloatTest, Mix_VectorScalar_f16) {
     EXPECT_TRUE(TypeOf(call)->As<sem::Vector>()->type()->Is<sem::F16>());
 }
 
-// modf: (f32) -> __modf_result, (vecN<f32>) -> __modf_result_vecN
-TEST_F(ResolverBuiltinFloatTest, ModfScalar) {
+// modf: (f32) -> __modf_result, (vecN<f32>) -> __modf_result_vecN, (f16) -> __modf_result_f16,
+// (vecN<f16>) -> __modf_result_vecN_f16
+TEST_F(ResolverBuiltinFloatTest, ModfScalar_f32) {
     auto* call = Call("modf", 1_f);
     WrapInFunction(call);
 
@@ -1159,7 +1227,38 @@ TEST_F(ResolverBuiltinFloatTest, ModfScalar) {
     EXPECT_EQ(ty->SizeNoPadding(), 8u);
 }
 
-TEST_F(ResolverBuiltinFloatTest, ModfVector) {
+TEST_F(ResolverBuiltinFloatTest, ModfScalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", 1_h);
+    WrapInFunction(call);
+
+    EXPECT_TRUE(r()->Resolve()) << r()->error();
+
+    ASSERT_NE(TypeOf(call), nullptr);
+    auto* ty = TypeOf(call)->As<sem::Struct>();
+    ASSERT_NE(ty, nullptr);
+    ASSERT_EQ(ty->Members().size(), 2u);
+
+    auto* fract = ty->Members()[0];
+    EXPECT_TRUE(fract->Type()->Is<sem::F16>());
+    EXPECT_EQ(fract->Offset(), 0u);
+    EXPECT_EQ(fract->Size(), 2u);
+    EXPECT_EQ(fract->Align(), 2u);
+    EXPECT_EQ(fract->Name(), Sym("fract"));
+
+    auto* whole = ty->Members()[1];
+    EXPECT_TRUE(whole->Type()->Is<sem::F16>());
+    EXPECT_EQ(whole->Offset(), 2u);
+    EXPECT_EQ(whole->Size(), 2u);
+    EXPECT_EQ(whole->Align(), 2u);
+    EXPECT_EQ(whole->Name(), Sym("whole"));
+
+    EXPECT_EQ(ty->Size(), 4u);
+    EXPECT_EQ(ty->SizeNoPadding(), 4u);
+}
+
+TEST_F(ResolverBuiltinFloatTest, ModfVector_f32) {
     auto* call = Call("modf", vec3<f32>());
     WrapInFunction(call);
 
@@ -1192,6 +1291,41 @@ TEST_F(ResolverBuiltinFloatTest, ModfVector) {
     EXPECT_EQ(ty->SizeNoPadding(), 28u);
 }
 
+TEST_F(ResolverBuiltinFloatTest, ModfVector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", vec3<f16>());
+    WrapInFunction(call);
+
+    EXPECT_TRUE(r()->Resolve()) << r()->error();
+
+    ASSERT_NE(TypeOf(call), nullptr);
+    auto* ty = TypeOf(call)->As<sem::Struct>();
+    ASSERT_NE(ty, nullptr);
+    ASSERT_EQ(ty->Members().size(), 2u);
+
+    auto* fract = ty->Members()[0];
+    ASSERT_TRUE(fract->Type()->Is<sem::Vector>());
+    EXPECT_EQ(fract->Type()->As<sem::Vector>()->Width(), 3u);
+    EXPECT_TRUE(fract->Type()->As<sem::Vector>()->type()->Is<sem::F16>());
+    EXPECT_EQ(fract->Offset(), 0u);
+    EXPECT_EQ(fract->Size(), 6u);
+    EXPECT_EQ(fract->Align(), 8u);
+    EXPECT_EQ(fract->Name(), Sym("fract"));
+
+    auto* whole = ty->Members()[1];
+    ASSERT_TRUE(whole->Type()->Is<sem::Vector>());
+    EXPECT_EQ(whole->Type()->As<sem::Vector>()->Width(), 3u);
+    EXPECT_TRUE(whole->Type()->As<sem::Vector>()->type()->Is<sem::F16>());
+    EXPECT_EQ(whole->Offset(), 8u);
+    EXPECT_EQ(whole->Size(), 6u);
+    EXPECT_EQ(whole->Align(), 8u);
+    EXPECT_EQ(whole->Name(), Sym("whole"));
+
+    EXPECT_EQ(ty->Size(), 16u);
+    EXPECT_EQ(ty->SizeNoPadding(), 14u);
+}
+
 TEST_F(ResolverBuiltinFloatTest, Modf_Error_FirstParamInt) {
     GlobalVar("whole", ty.f32(), ast::StorageClass::kWorkgroup);
     auto* call = Call("modf", 1_i, AddressOf("whole"));
@@ -1203,8 +1337,8 @@ TEST_F(ResolverBuiltinFloatTest, Modf_Error_FirstParamInt) {
               R"(error: no matching call to modf(i32, ptr<workgroup, f32, read_write>)
 
 2 candidate functions:
-  modf(f32) -> __modf_result
-  modf(vecN<f32>) -> __modf_result_vecN
+  modf(T) -> __modf_result_T  where: T is f32 or f16
+  modf(vecN<T>) -> __modf_result_vecN_T  where: T is f32 or f16
 )");
 }
 
@@ -1219,8 +1353,8 @@ TEST_F(ResolverBuiltinFloatTest, Modf_Error_SecondParamIntPtr) {
               R"(error: no matching call to modf(f32, ptr<workgroup, i32, read_write>)
 
 2 candidate functions:
-  modf(f32) -> __modf_result
-  modf(vecN<f32>) -> __modf_result_vecN
+  modf(T) -> __modf_result_T  where: T is f32 or f16
+  modf(vecN<T>) -> __modf_result_vecN_T  where: T is f32 or f16
 )");
 }
 
@@ -1233,8 +1367,8 @@ TEST_F(ResolverBuiltinFloatTest, Modf_Error_SecondParamNotAPointer) {
     EXPECT_EQ(r()->error(), R"(error: no matching call to modf(f32, f32)
 
 2 candidate functions:
-  modf(f32) -> __modf_result
-  modf(vecN<f32>) -> __modf_result_vecN
+  modf(T) -> __modf_result_T  where: T is f32 or f16
+  modf(vecN<T>) -> __modf_result_vecN_T  where: T is f32 or f16
 )");
 }
 
@@ -1249,8 +1383,8 @@ TEST_F(ResolverBuiltinFloatTest, Modf_Error_VectorSizesDontMatch) {
               R"(error: no matching call to modf(vec2<f32>, ptr<workgroup, vec4<f32>, read_write>)
 
 2 candidate functions:
-  modf(vecN<f32>) -> __modf_result_vecN
-  modf(f32) -> __modf_result
+  modf(T) -> __modf_result_T  where: T is f32 or f16
+  modf(vecN<T>) -> __modf_result_vecN_T  where: T is f32 or f16
 )");
 }
 
diff --git a/src/tint/resolver/intrinsic_table.cc b/src/tint/resolver/intrinsic_table.cc
index e7b52c5b5c..67a75c3a37 100644
--- a/src/tint/resolver/intrinsic_table.cc
+++ b/src/tint/resolver/intrinsic_table.cc
@@ -732,24 +732,34 @@ const sem::ExternalTexture* build_texture_external(MatchState& state) {
 // Builtin types starting with a _ prefix cannot be declared in WGSL, so they
 // can only be used as return types. Because of this, they must only match Any,
 // which is used as the return type matcher.
-bool match_modf_result(const sem::Type* ty) {
-    return ty->Is<Any>();
-}
-bool match_modf_result_vec(const sem::Type* ty, Number& N) {
+bool match_modf_result(const sem::Type* ty, const sem::Type*& T) {
     if (!ty->Is<Any>()) {
         return false;
     }
-    N = Number::any;
+    T = ty;
     return true;
 }
-bool match_frexp_result(const sem::Type* ty) {
-    return ty->Is<Any>();
-}
-bool match_frexp_result_vec(const sem::Type* ty, Number& N) {
+bool match_modf_result_vec(const sem::Type* ty, Number& N, const sem::Type*& T) {
     if (!ty->Is<Any>()) {
         return false;
     }
     N = Number::any;
+    T = ty;
+    return true;
+}
+bool match_frexp_result(const sem::Type* ty, const sem::Type*& T) {
+    if (!ty->Is<Any>()) {
+        return false;
+    }
+    T = ty;
+    return true;
+}
+bool match_frexp_result_vec(const sem::Type* ty, Number& N, const sem::Type*& T) {
+    if (!ty->Is<Any>()) {
+        return false;
+    }
+    N = Number::any;
+    T = ty;
     return true;
 }
 
@@ -763,7 +773,7 @@ bool match_atomic_compare_exchange_result(const sem::Type* ty, const sem::Type*&
 
 struct NameAndType {
     std::string name;
-    sem::Type* type;
+    const sem::Type* type;
 };
 const sem::Struct* build_struct(MatchState& state,
                                 std::string name,
@@ -797,27 +807,46 @@ const sem::Struct* build_struct(MatchState& state,
         /* size_no_padding */ size_without_padding);
 }
 
-const sem::Struct* build_modf_result(MatchState& state) {
-    auto* f32 = state.builder.create<sem::F32>();
-    return build_struct(state, "__modf_result", {{"fract", f32}, {"whole", f32}});
+const sem::Struct* build_modf_result(MatchState& state, const sem::Type* el) {
+    std::string display_name;
+    if (el->Is<sem::F16>()) {
+        display_name = "__modf_result_f16";
+    } else {
+        display_name = "__modf_result";
+    }
+    return build_struct(state, display_name, {{"fract", el}, {"whole", el}});
 }
-const sem::Struct* build_modf_result_vec(MatchState& state, Number& n) {
-    auto* vec_f32 = state.builder.create<sem::Vector>(state.builder.create<sem::F32>(), n.Value());
-    return build_struct(state, "__modf_result_vec" + std::to_string(n.Value()),
-                        {{"fract", vec_f32}, {"whole", vec_f32}});
+const sem::Struct* build_modf_result_vec(MatchState& state, Number& n, const sem::Type* el) {
+    std::string display_name;
+    if (el->Is<sem::F16>()) {
+        display_name = "__modf_result_vec" + std::to_string(n.Value()) + "_f16";
+    } else {
+        display_name = "__modf_result_vec" + std::to_string(n.Value());
+    }
+    auto* vec = state.builder.create<sem::Vector>(el, n.Value());
+    return build_struct(state, display_name, {{"fract", vec}, {"whole", vec}});
 }
-const sem::Struct* build_frexp_result(MatchState& state) {
-    auto* f32 = state.builder.create<sem::F32>();
+const sem::Struct* build_frexp_result(MatchState& state, const sem::Type* el) {
+    std::string display_name;
+    if (el->Is<sem::F16>()) {
+        display_name = "__frexp_result_f16";
+    } else {
+        display_name = "__frexp_result";
+    }
     auto* i32 = state.builder.create<sem::I32>();
-    return build_struct(state, "__frexp_result", {{"sig", f32}, {"exp", i32}});
+    return build_struct(state, display_name, {{"sig", el}, {"exp", i32}});
 }
-const sem::Struct* build_frexp_result_vec(MatchState& state, Number& n) {
-    auto* vec_f32 = state.builder.create<sem::Vector>(state.builder.create<sem::F32>(), n.Value());
+const sem::Struct* build_frexp_result_vec(MatchState& state, Number& n, const sem::Type* el) {
+    std::string display_name;
+    if (el->Is<sem::F16>()) {
+        display_name = "__frexp_result_vec" + std::to_string(n.Value()) + "_f16";
+    } else {
+        display_name = "__frexp_result_vec" + std::to_string(n.Value());
+    }
+    auto* vec = state.builder.create<sem::Vector>(el, n.Value());
     auto* vec_i32 = state.builder.create<sem::Vector>(state.builder.create<sem::I32>(), n.Value());
-    return build_struct(state, "__frexp_result_vec" + std::to_string(n.Value()),
-                        {{"sig", vec_f32}, {"exp", vec_i32}});
+    return build_struct(state, display_name, {{"sig", vec}, {"exp", vec_i32}});
 }
-
 const sem::Struct* build_atomic_compare_exchange_result(MatchState& state, const sem::Type* ty) {
     return build_struct(
         state, "__atomic_compare_exchange_result" + ty->FriendlyName(state.builder.Symbols()),
diff --git a/src/tint/resolver/intrinsic_table.inl b/src/tint/resolver/intrinsic_table.inl
index 103ec3d402..16c177cecc 100644
--- a/src/tint/resolver/intrinsic_table.inl
+++ b/src/tint/resolver/intrinsic_table.inl
@@ -1386,14 +1386,22 @@ class ModfResult : public TypeMatcher {
 };
 
 const sem::Type* ModfResult::Match(MatchState& state, const sem::Type* ty) const {
-  if (!match_modf_result(ty)) {
+  const sem::Type* T = nullptr;
+  if (!match_modf_result(ty, T)) {
     return nullptr;
   }
-  return build_modf_result(state);
+  T = state.Type(T);
+  if (T == nullptr) {
+    return nullptr;
+  }
+  return build_modf_result(state, T);
 }
 
-std::string ModfResult::String(MatchState*) const {
-  return "__modf_result";
+std::string ModfResult::String(MatchState* state) const {
+  const std::string T = state->TypeName();
+  std::stringstream ss;
+  ss << "__modf_result_" << T;
+  return ss.str();
 }
 
 /// TypeMatcher for 'type __modf_result_vec'
@@ -1413,20 +1421,26 @@ class ModfResultVec : public TypeMatcher {
 
 const sem::Type* ModfResultVec::Match(MatchState& state, const sem::Type* ty) const {
   Number N = Number::invalid;
-  if (!match_modf_result_vec(ty, N)) {
+  const sem::Type* T = nullptr;
+  if (!match_modf_result_vec(ty, N, T)) {
     return nullptr;
   }
   N = state.Num(N);
   if (!N.IsValid()) {
     return nullptr;
   }
-  return build_modf_result_vec(state, N);
+  T = state.Type(T);
+  if (T == nullptr) {
+    return nullptr;
+  }
+  return build_modf_result_vec(state, N, T);
 }
 
 std::string ModfResultVec::String(MatchState* state) const {
   const std::string N = state->NumName();
+  const std::string T = state->TypeName();
   std::stringstream ss;
-  ss << "__modf_result_vec" << N;
+  ss << "__modf_result_vec" << N << "_" << T;
   return ss.str();
 }
 
@@ -1446,14 +1460,22 @@ class FrexpResult : public TypeMatcher {
 };
 
 const sem::Type* FrexpResult::Match(MatchState& state, const sem::Type* ty) const {
-  if (!match_frexp_result(ty)) {
+  const sem::Type* T = nullptr;
+  if (!match_frexp_result(ty, T)) {
     return nullptr;
   }
-  return build_frexp_result(state);
+  T = state.Type(T);
+  if (T == nullptr) {
+    return nullptr;
+  }
+  return build_frexp_result(state, T);
 }
 
-std::string FrexpResult::String(MatchState*) const {
-  return "__frexp_result";
+std::string FrexpResult::String(MatchState* state) const {
+  const std::string T = state->TypeName();
+  std::stringstream ss;
+  ss << "__frexp_result_" << T;
+  return ss.str();
 }
 
 /// TypeMatcher for 'type __frexp_result_vec'
@@ -1473,20 +1495,26 @@ class FrexpResultVec : public TypeMatcher {
 
 const sem::Type* FrexpResultVec::Match(MatchState& state, const sem::Type* ty) const {
   Number N = Number::invalid;
-  if (!match_frexp_result_vec(ty, N)) {
+  const sem::Type* T = nullptr;
+  if (!match_frexp_result_vec(ty, N, T)) {
     return nullptr;
   }
   N = state.Num(N);
   if (!N.IsValid()) {
     return nullptr;
   }
-  return build_frexp_result_vec(state, N);
+  T = state.Type(T);
+  if (T == nullptr) {
+    return nullptr;
+  }
+  return build_frexp_result_vec(state, N, T);
 }
 
 std::string FrexpResultVec::String(MatchState* state) const {
   const std::string N = state->NumName();
+  const std::string T = state->TypeName();
   std::stringstream ss;
-  ss << "__frexp_result_vec" << N;
+  ss << "__frexp_result_vec" << N << "_" << T;
   return ss.str();
 }
 
@@ -2724,12 +2752,12 @@ constexpr MatcherIndex kMatcherIndices[] = {
   /* [42] */ 41,
   /* [43] */ 5,
   /* [44] */ 6,
-  /* [45] */ 42,
-  /* [46] */ 0,
-  /* [47] */ 1,
-  /* [48] */ 40,
-  /* [49] */ 5,
-  /* [50] */ 6,
+  /* [45] */ 40,
+  /* [46] */ 5,
+  /* [47] */ 6,
+  /* [48] */ 42,
+  /* [49] */ 0,
+  /* [50] */ 1,
   /* [51] */ 43,
   /* [52] */ 4,
   /* [53] */ 6,
@@ -2757,162 +2785,166 @@ constexpr MatcherIndex kMatcherIndices[] = {
   /* [75] */ 41,
   /* [76] */ 3,
   /* [77] */ 6,
-  /* [78] */ 43,
+  /* [78] */ 48,
   /* [79] */ 0,
-  /* [80] */ 1,
-  /* [81] */ 41,
+  /* [80] */ 0,
+  /* [81] */ 43,
   /* [82] */ 0,
   /* [83] */ 1,
-  /* [84] */ 40,
+  /* [84] */ 41,
   /* [85] */ 0,
   /* [86] */ 1,
-  /* [87] */ 21,
+  /* [87] */ 40,
   /* [88] */ 0,
-  /* [89] */ 5,
+  /* [89] */ 1,
   /* [90] */ 21,
   /* [91] */ 0,
-  /* [92] */ 6,
-  /* [93] */ 40,
-  /* [94] */ 3,
+  /* [92] */ 5,
+  /* [93] */ 21,
+  /* [94] */ 0,
   /* [95] */ 6,
-  /* [96] */ 17,
+  /* [96] */ 46,
   /* [97] */ 0,
-  /* [98] */ 10,
-  /* [99] */ 1,
-  /* [100] */ 10,
-  /* [101] */ 7,
-  /* [102] */ 10,
-  /* [103] */ 8,
+  /* [98] */ 0,
+  /* [99] */ 40,
+  /* [100] */ 3,
+  /* [101] */ 6,
+  /* [102] */ 17,
+  /* [103] */ 0,
   /* [104] */ 10,
-  /* [105] */ 5,
-  /* [106] */ 9,
-  /* [107] */ 0,
+  /* [105] */ 7,
+  /* [106] */ 10,
+  /* [107] */ 1,
   /* [108] */ 10,
-  /* [109] */ 0,
+  /* [109] */ 8,
   /* [110] */ 10,
-  /* [111] */ 6,
+  /* [111] */ 5,
   /* [112] */ 10,
-  /* [113] */ 2,
-  /* [114] */ 11,
-  /* [115] */ 0,
+  /* [113] */ 0,
+  /* [114] */ 10,
+  /* [115] */ 6,
   /* [116] */ 9,
-  /* [117] */ 2,
-  /* [118] */ 9,
-  /* [119] */ 1,
+  /* [117] */ 0,
+  /* [118] */ 10,
+  /* [119] */ 2,
   /* [120] */ 11,
-  /* [121] */ 7,
+  /* [121] */ 0,
   /* [122] */ 9,
-  /* [123] */ 6,
+  /* [123] */ 2,
   /* [124] */ 9,
-  /* [125] */ 5,
-  /* [126] */ 9,
-  /* [127] */ 8,
+  /* [125] */ 1,
+  /* [126] */ 11,
+  /* [127] */ 7,
   /* [128] */ 9,
-  /* [129] */ 7,
-  /* [130] */ 46,
-  /* [131] */ 0,
-  /* [132] */ 28,
-  /* [133] */ 0,
-  /* [134] */ 11,
-  /* [135] */ 1,
-  /* [136] */ 29,
+  /* [129] */ 6,
+  /* [130] */ 9,
+  /* [131] */ 5,
+  /* [132] */ 9,
+  /* [133] */ 8,
+  /* [134] */ 9,
+  /* [135] */ 7,
+  /* [136] */ 45,
   /* [137] */ 0,
-  /* [138] */ 30,
+  /* [138] */ 28,
   /* [139] */ 0,
-  /* [140] */ 11,
-  /* [141] */ 8,
-  /* [142] */ 31,
+  /* [140] */ 29,
+  /* [141] */ 0,
+  /* [142] */ 30,
   /* [143] */ 0,
   /* [144] */ 11,
-  /* [145] */ 5,
-  /* [146] */ 32,
+  /* [145] */ 1,
+  /* [146] */ 31,
   /* [147] */ 0,
-  /* [148] */ 33,
+  /* [148] */ 32,
   /* [149] */ 0,
   /* [150] */ 11,
-  /* [151] */ 6,
-  /* [152] */ 34,
+  /* [151] */ 8,
+  /* [152] */ 33,
   /* [153] */ 0,
-  /* [154] */ 11,
-  /* [155] */ 2,
-  /* [156] */ 12,
-  /* [157] */ 0,
-  /* [158] */ 12,
-  /* [159] */ 7,
-  /* [160] */ 31,
-  /* [161] */ 7,
+  /* [154] */ 34,
+  /* [155] */ 0,
+  /* [156] */ 11,
+  /* [157] */ 5,
+  /* [158] */ 11,
+  /* [159] */ 6,
+  /* [160] */ 11,
+  /* [161] */ 2,
   /* [162] */ 12,
-  /* [163] */ 8,
-  /* [164] */ 13,
-  /* [165] */ 0,
-  /* [166] */ 48,
-  /* [167] */ 0,
+  /* [163] */ 0,
+  /* [164] */ 12,
+  /* [165] */ 7,
+  /* [166] */ 12,
+  /* [167] */ 8,
   /* [168] */ 13,
-  /* [169] */ 7,
+  /* [169] */ 0,
   /* [170] */ 13,
-  /* [171] */ 8,
-  /* [172] */ 14,
+  /* [171] */ 7,
+  /* [172] */ 47,
   /* [173] */ 0,
-  /* [174] */ 14,
-  /* [175] */ 7,
+  /* [174] */ 13,
+  /* [175] */ 8,
   /* [176] */ 14,
-  /* [177] */ 8,
-  /* [178] */ 15,
-  /* [179] */ 0,
-  /* [180] */ 15,
-  /* [181] */ 7,
+  /* [177] */ 0,
+  /* [178] */ 14,
+  /* [179] */ 7,
+  /* [180] */ 14,
+  /* [181] */ 8,
   /* [182] */ 15,
-  /* [183] */ 8,
-  /* [184] */ 16,
-  /* [185] */ 0,
-  /* [186] */ 16,
-  /* [187] */ 7,
+  /* [183] */ 0,
+  /* [184] */ 15,
+  /* [185] */ 7,
+  /* [186] */ 15,
+  /* [187] */ 8,
   /* [188] */ 16,
-  /* [189] */ 8,
-  /* [190] */ 17,
+  /* [189] */ 0,
+  /* [190] */ 16,
   /* [191] */ 7,
-  /* [192] */ 17,
+  /* [192] */ 16,
   /* [193] */ 8,
-  /* [194] */ 18,
-  /* [195] */ 0,
-  /* [196] */ 18,
-  /* [197] */ 7,
+  /* [194] */ 17,
+  /* [195] */ 7,
+  /* [196] */ 17,
+  /* [197] */ 8,
   /* [198] */ 18,
-  /* [199] */ 8,
-  /* [200] */ 19,
-  /* [201] */ 0,
-  /* [202] */ 49,
-  /* [203] */ 0,
-  /* [204] */ 28,
-  /* [205] */ 7,
-  /* [206] */ 29,
-  /* [207] */ 7,
-  /* [208] */ 30,
+  /* [199] */ 0,
+  /* [200] */ 18,
+  /* [201] */ 7,
+  /* [202] */ 18,
+  /* [203] */ 8,
+  /* [204] */ 19,
+  /* [205] */ 0,
+  /* [206] */ 49,
+  /* [207] */ 0,
+  /* [208] */ 28,
   /* [209] */ 7,
-  /* [210] */ 19,
+  /* [210] */ 29,
   /* [211] */ 7,
-  /* [212] */ 19,
-  /* [213] */ 8,
-  /* [214] */ 32,
+  /* [212] */ 30,
+  /* [213] */ 7,
+  /* [214] */ 31,
   /* [215] */ 7,
-  /* [216] */ 33,
+  /* [216] */ 19,
   /* [217] */ 7,
-  /* [218] */ 20,
-  /* [219] */ 0,
-  /* [220] */ 20,
+  /* [218] */ 19,
+  /* [219] */ 8,
+  /* [220] */ 32,
   /* [221] */ 7,
-  /* [222] */ 20,
-  /* [223] */ 8,
-  /* [224] */ 26,
-  /* [225] */ 38,
-  /* [226] */ 27,
-  /* [227] */ 37,
-  /* [228] */ 36,
-  /* [229] */ 35,
-  /* [230] */ 44,
-  /* [231] */ 39,
-  /* [232] */ 45,
-  /* [233] */ 47,
+  /* [222] */ 33,
+  /* [223] */ 7,
+  /* [224] */ 20,
+  /* [225] */ 0,
+  /* [226] */ 20,
+  /* [227] */ 7,
+  /* [228] */ 20,
+  /* [229] */ 8,
+  /* [230] */ 26,
+  /* [231] */ 38,
+  /* [232] */ 27,
+  /* [233] */ 37,
+  /* [234] */ 36,
+  /* [235] */ 35,
+  /* [236] */ 44,
+  /* [237] */ 39,
 };
 
 // Assert that the MatcherIndex is big enough to index all the matchers, plus
@@ -3250,17 +3282,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [65] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [66] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [67] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [68] */
@@ -3270,32 +3302,32 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [69] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [70] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [71] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [72] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [73] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [74] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [75] */
@@ -3310,37 +3342,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [77] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [78] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [79] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [80] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [81] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [82] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [83] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [84] */
@@ -3375,17 +3407,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [90] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [91] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [92] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [93] */
@@ -3400,7 +3432,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [95] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [96] */
@@ -3410,17 +3442,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [97] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[138],
+    /* matcher indices */ &kMatcherIndices[142],
   },
   {
     /* [98] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [99] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [100] */
@@ -3430,22 +3462,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [101] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [102] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [103] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [104] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [105] */
@@ -3455,42 +3487,42 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [106] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [107] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [108] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [109] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [110] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [111] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [112] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [113] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [114] */
@@ -3525,17 +3557,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [120] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[216],
+    /* matcher indices */ &kMatcherIndices[222],
   },
   {
     /* [121] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [122] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [123] */
@@ -3545,27 +3577,27 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [124] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [125] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [126] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [127] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [128] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [129] */
@@ -3580,22 +3612,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [131] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [132] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [133] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [134] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [135] */
@@ -3610,22 +3642,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [137] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [138] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [139] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [140] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [141] */
@@ -3640,22 +3672,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [143] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [144] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [145] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [146] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [147] */
@@ -3670,22 +3702,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [149] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [150] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [151] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [152] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [153] */
@@ -3700,17 +3732,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [155] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [156] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [157] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [158] */
@@ -3725,17 +3757,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [160] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [161] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [162] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [163] */
@@ -3745,22 +3777,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [164] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [165] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [166] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [167] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [168] */
@@ -3770,7 +3802,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [169] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [170] */
@@ -3780,17 +3812,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [171] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[148],
+    /* matcher indices */ &kMatcherIndices[152],
   },
   {
     /* [172] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [173] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [174] */
@@ -3800,17 +3832,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [175] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [176] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [177] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [178] */
@@ -3825,42 +3857,42 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [180] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [181] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [182] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [183] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [184] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [185] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [186] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [187] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [188] */
@@ -3870,22 +3902,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [189] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [190] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [191] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [192] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [193] */
@@ -3900,17 +3932,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [195] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [196] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [197] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [198] */
@@ -3920,22 +3952,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [199] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [200] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [201] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [202] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [203] */
@@ -3945,22 +3977,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [204] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [205] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [206] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [207] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [208] */
@@ -3970,22 +4002,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [209] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [210] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [211] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [212] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [213] */
@@ -4005,17 +4037,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [216] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[138],
+    /* matcher indices */ &kMatcherIndices[142],
   },
   {
     /* [217] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [218] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [219] */
@@ -4025,17 +4057,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [220] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [221] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [222] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [223] */
@@ -4050,17 +4082,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [225] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [226] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [227] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [228] */
@@ -4070,22 +4102,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [229] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [230] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [231] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [232] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [233] */
@@ -4095,47 +4127,47 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [234] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [235] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [236] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [237] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [238] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [239] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [240] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [241] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [242] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [243] */
@@ -4145,32 +4177,32 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [244] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [245] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[214],
+    /* matcher indices */ &kMatcherIndices[220],
   },
   {
     /* [246] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [247] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [248] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [249] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [250] */
@@ -4180,37 +4212,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [251] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[136],
+    /* matcher indices */ &kMatcherIndices[140],
   },
   {
     /* [252] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [253] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [254] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [255] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [256] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [257] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [258] */
@@ -4225,17 +4257,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [260] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [261] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [262] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [263] */
@@ -4250,17 +4282,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [265] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [266] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [267] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [268] */
@@ -4270,22 +4302,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [269] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [270] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [271] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [272] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [273] */
@@ -4300,17 +4332,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [275] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [276] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [277] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [278] */
@@ -4320,22 +4352,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [279] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [280] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[216],
+    /* matcher indices */ &kMatcherIndices[222],
   },
   {
     /* [281] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [282] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [283] */
@@ -4350,17 +4382,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [285] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[216],
+    /* matcher indices */ &kMatcherIndices[222],
   },
   {
     /* [286] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [287] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [288] */
@@ -4375,17 +4407,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [290] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [291] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [292] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [293] */
@@ -4400,17 +4432,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [295] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[214],
+    /* matcher indices */ &kMatcherIndices[220],
   },
   {
     /* [296] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [297] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [298] */
@@ -4420,17 +4452,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [299] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [300] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [301] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [302] */
@@ -4440,17 +4472,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [303] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [304] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [305] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [306] */
@@ -4460,17 +4492,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [307] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [308] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [309] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [310] */
@@ -4485,7 +4517,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [312] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [313] */
@@ -4495,22 +4527,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [314] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[144],
+    /* matcher indices */ &kMatcherIndices[156],
   },
   {
     /* [315] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [316] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [317] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [318] */
@@ -4520,17 +4552,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [319] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [320] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [321] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [322] */
@@ -4540,37 +4572,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [323] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [324] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [325] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [326] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [327] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[216],
+    /* matcher indices */ &kMatcherIndices[222],
   },
   {
     /* [328] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [329] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [330] */
@@ -4580,22 +4612,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [331] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [332] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [333] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [334] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [335] */
@@ -4605,7 +4637,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [336] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [337] */
@@ -4615,22 +4647,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [338] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[120],
+    /* matcher indices */ &kMatcherIndices[126],
   },
   {
     /* [339] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [340] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [341] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [342] */
@@ -4640,17 +4672,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [343] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [344] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [345] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [346] */
@@ -4660,17 +4692,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [347] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[208],
+    /* matcher indices */ &kMatcherIndices[212],
   },
   {
     /* [348] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [349] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [350] */
@@ -4680,37 +4712,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [351] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [352] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [353] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [354] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [355] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [356] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [357] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [358] */
@@ -4725,7 +4757,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [360] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [361] */
@@ -4735,17 +4767,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [362] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[150],
+    /* matcher indices */ &kMatcherIndices[158],
   },
   {
     /* [363] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[138],
+    /* matcher indices */ &kMatcherIndices[142],
   },
   {
     /* [364] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [365] */
@@ -4760,17 +4792,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [367] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [368] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [369] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [370] */
@@ -4780,17 +4812,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [371] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [372] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [373] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [374] */
@@ -4800,17 +4832,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [375] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [376] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [377] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [378] */
@@ -4820,17 +4852,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [379] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [380] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [381] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [382] */
@@ -4840,12 +4872,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [383] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [384] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [385] */
@@ -4860,57 +4892,57 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [387] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [388] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [389] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [390] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [391] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [392] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [393] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [394] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [395] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [396] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [397] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [398] */
@@ -4940,17 +4972,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [403] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [404] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [405] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [406] */
@@ -4965,17 +4997,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [408] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[146],
+    /* matcher indices */ &kMatcherIndices[148],
   },
   {
     /* [409] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [410] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [411] */
@@ -5000,37 +5032,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [415] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [416] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [417] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [418] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [419] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [420] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[226],
+    /* matcher indices */ &kMatcherIndices[232],
   },
   {
     /* [421] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [422] */
@@ -5085,32 +5117,32 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [432] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[136],
+    /* matcher indices */ &kMatcherIndices[140],
   },
   {
     /* [433] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [434] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [435] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[214],
+    /* matcher indices */ &kMatcherIndices[220],
   },
   {
     /* [436] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [437] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [438] */
@@ -5120,17 +5152,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [439] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [440] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [441] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [442] */
@@ -5140,22 +5172,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [443] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [444] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [445] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [446] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [447] */
@@ -5235,17 +5267,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [462] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [463] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [464] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [465] */
@@ -5255,57 +5287,57 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [466] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [467] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[150],
+    /* matcher indices */ &kMatcherIndices[158],
   },
   {
     /* [468] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [469] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [470] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [471] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[230],
+    /* matcher indices */ &kMatcherIndices[236],
   },
   {
     /* [472] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [473] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [474] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [475] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [476] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [477] */
@@ -5355,7 +5387,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [486] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[93],
+    /* matcher indices */ &kMatcherIndices[99],
   },
   {
     /* [487] */
@@ -5365,22 +5397,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [488] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[120],
+    /* matcher indices */ &kMatcherIndices[126],
   },
   {
     /* [489] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[214],
+    /* matcher indices */ &kMatcherIndices[220],
   },
   {
     /* [490] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [491] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [492] */
@@ -5390,27 +5422,27 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [493] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [494] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[120],
+    /* matcher indices */ &kMatcherIndices[126],
   },
   {
     /* [495] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[160],
+    /* matcher indices */ &kMatcherIndices[214],
   },
   {
     /* [496] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [497] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [498] */
@@ -5420,12 +5452,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [499] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [500] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[120],
+    /* matcher indices */ &kMatcherIndices[126],
   },
   {
     /* [501] */
@@ -5440,7 +5472,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [503] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[144],
+    /* matcher indices */ &kMatcherIndices[156],
   },
   {
     /* [504] */
@@ -5450,37 +5482,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [505] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [506] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[144],
+    /* matcher indices */ &kMatcherIndices[156],
   },
   {
     /* [507] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[206],
+    /* matcher indices */ &kMatcherIndices[210],
   },
   {
     /* [508] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [509] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [510] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[204],
+    /* matcher indices */ &kMatcherIndices[208],
   },
   {
     /* [511] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [512] */
@@ -5495,17 +5527,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [514] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [515] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[144],
+    /* matcher indices */ &kMatcherIndices[156],
   },
   {
     /* [516] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[48],
+    /* matcher indices */ &kMatcherIndices[45],
   },
   {
     /* [517] */
@@ -5515,7 +5547,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [518] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[150],
+    /* matcher indices */ &kMatcherIndices[158],
   },
   {
     /* [519] */
@@ -5525,17 +5557,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [520] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [521] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[150],
+    /* matcher indices */ &kMatcherIndices[158],
   },
   {
     /* [522] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[138],
   },
   {
     /* [523] */
@@ -5565,12 +5597,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [528] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[136],
+    /* matcher indices */ &kMatcherIndices[140],
   },
   {
     /* [529] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [530] */
@@ -5580,12 +5612,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [531] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[142],
+    /* matcher indices */ &kMatcherIndices[146],
   },
   {
     /* [532] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[104],
+    /* matcher indices */ &kMatcherIndices[110],
   },
   {
     /* [533] */
@@ -5670,12 +5702,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [549] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[152],
+    /* matcher indices */ &kMatcherIndices[154],
   },
   {
     /* [550] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [551] */
@@ -5685,12 +5717,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [552] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [553] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [554] */
@@ -5700,12 +5732,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [555] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[231],
+    /* matcher indices */ &kMatcherIndices[237],
   },
   {
     /* [556] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [557] */
@@ -5715,17 +5747,17 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [558] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [559] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [560] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [561] */
@@ -5745,7 +5777,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [564] */
     /* usage */ ParameterUsage::kXy,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [565] */
@@ -5795,7 +5827,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [574] */
     /* usage */ ParameterUsage::kYz,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [575] */
@@ -5815,52 +5847,52 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [578] */
     /* usage */ ParameterUsage::kZw,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [579] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [580] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [581] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [582] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [583] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [584] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [585] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [586] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[224],
+    /* matcher indices */ &kMatcherIndices[230],
   },
   {
     /* [587] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[100],
+    /* matcher indices */ &kMatcherIndices[104],
   },
   {
     /* [588] */
@@ -5890,32 +5922,32 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [593] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [594] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [595] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [596] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [597] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [598] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [599] */
@@ -5935,12 +5967,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [602] */
     /* usage */ ParameterUsage::kZyw,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [603] */
     /* usage */ ParameterUsage::kXyz,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [604] */
@@ -5950,12 +5982,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [605] */
     /* usage */ ParameterUsage::kXy,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [606] */
     /* usage */ ParameterUsage::kZw,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [607] */
@@ -5965,12 +5997,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [608] */
     /* usage */ ParameterUsage::kYz,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [609] */
     /* usage */ ParameterUsage::kXy,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [610] */
@@ -6005,12 +6037,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [616] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[90],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [617] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[138],
   },
   {
     /* [618] */
@@ -6030,7 +6062,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [621] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[136],
+    /* matcher indices */ &kMatcherIndices[140],
   },
   {
     /* [622] */
@@ -6045,12 +6077,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [624] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[90],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [625] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[138],
+    /* matcher indices */ &kMatcherIndices[142],
   },
   {
     /* [626] */
@@ -6070,7 +6102,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [629] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[142],
+    /* matcher indices */ &kMatcherIndices[146],
   },
   {
     /* [630] */
@@ -6090,7 +6122,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [633] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[146],
+    /* matcher indices */ &kMatcherIndices[148],
   },
   {
     /* [634] */
@@ -6110,7 +6142,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [637] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[148],
+    /* matcher indices */ &kMatcherIndices[152],
   },
   {
     /* [638] */
@@ -6140,7 +6172,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [643] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [644] */
@@ -6160,7 +6192,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [647] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [648] */
@@ -6180,7 +6212,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [651] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [652] */
@@ -6200,7 +6232,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [655] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [656] */
@@ -6815,7 +6847,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [778] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[87],
+    /* matcher indices */ &kMatcherIndices[90],
   },
   {
     /* [779] */
@@ -6840,22 +6872,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [783] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[230],
+    /* matcher indices */ &kMatcherIndices[236],
   },
   {
     /* [784] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[124],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [785] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [786] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [787] */
@@ -6915,7 +6947,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [798] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[4],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [799] */
@@ -6975,7 +7007,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [810] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[60],
+    /* matcher indices */ &kMatcherIndices[30],
   },
   {
     /* [811] */
@@ -7100,7 +7132,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [835] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [836] */
@@ -7200,12 +7232,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [855] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[4],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [856] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[60],
+    /* matcher indices */ &kMatcherIndices[30],
   },
   {
     /* [857] */
@@ -7245,112 +7277,112 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [864] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [865] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [866] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[128],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [867] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[120],
+    /* matcher indices */ &kMatcherIndices[126],
   },
   {
     /* [868] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[120],
+    /* matcher indices */ &kMatcherIndices[126],
   },
   {
     /* [869] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[231],
+    /* matcher indices */ &kMatcherIndices[237],
   },
   {
     /* [870] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[152],
+    /* matcher indices */ &kMatcherIndices[154],
   },
   {
     /* [871] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [872] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [873] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [874] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [875] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[148],
+    /* matcher indices */ &kMatcherIndices[152],
   },
   {
     /* [876] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[146],
+    /* matcher indices */ &kMatcherIndices[148],
   },
   {
     /* [877] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[142],
+    /* matcher indices */ &kMatcherIndices[146],
   },
   {
     /* [878] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[138],
+    /* matcher indices */ &kMatcherIndices[142],
   },
   {
     /* [879] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[136],
+    /* matcher indices */ &kMatcherIndices[140],
   },
   {
     /* [880] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[138],
   },
   {
     /* [881] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[45],
+    /* matcher indices */ &kMatcherIndices[48],
   },
   {
     /* [882] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[225],
+    /* matcher indices */ &kMatcherIndices[231],
   },
   {
     /* [883] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [884] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[148],
+    /* matcher indices */ &kMatcherIndices[152],
   },
   {
     /* [885] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[138],
+    /* matcher indices */ &kMatcherIndices[142],
   },
   {
     /* [886] */
@@ -7430,92 +7462,92 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [901] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[230],
+    /* matcher indices */ &kMatcherIndices[236],
   },
   {
     /* [902] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[78],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [903] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[45],
+    /* matcher indices */ &kMatcherIndices[48],
   },
   {
     /* [904] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[84],
   },
   {
     /* [905] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[84],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [906] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[222],
+    /* matcher indices */ &kMatcherIndices[228],
   },
   {
     /* [907] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[231],
+    /* matcher indices */ &kMatcherIndices[237],
   },
   {
     /* [908] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[220],
+    /* matcher indices */ &kMatcherIndices[226],
   },
   {
     /* [909] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[227],
+    /* matcher indices */ &kMatcherIndices[233],
   },
   {
     /* [910] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[228],
+    /* matcher indices */ &kMatcherIndices[234],
   },
   {
     /* [911] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[229],
+    /* matcher indices */ &kMatcherIndices[235],
   },
   {
     /* [912] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[152],
+    /* matcher indices */ &kMatcherIndices[154],
   },
   {
     /* [913] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[148],
+    /* matcher indices */ &kMatcherIndices[152],
   },
   {
     /* [914] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[146],
+    /* matcher indices */ &kMatcherIndices[148],
   },
   {
     /* [915] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[142],
+    /* matcher indices */ &kMatcherIndices[146],
   },
   {
     /* [916] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[138],
+    /* matcher indices */ &kMatcherIndices[142],
   },
   {
     /* [917] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[136],
+    /* matcher indices */ &kMatcherIndices[140],
   },
   {
     /* [918] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[138],
   },
   {
     /* [919] */
@@ -7535,7 +7567,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [922] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[218],
+    /* matcher indices */ &kMatcherIndices[224],
   },
   {
     /* [923] */
@@ -7550,7 +7582,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [925] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[212],
+    /* matcher indices */ &kMatcherIndices[218],
   },
   {
     /* [926] */
@@ -7565,12 +7597,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [928] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[210],
+    /* matcher indices */ &kMatcherIndices[216],
   },
   {
     /* [929] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[103],
+    /* matcher indices */ &kMatcherIndices[109],
   },
   {
     /* [930] */
@@ -7600,7 +7632,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [935] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[106],
+    /* matcher indices */ &kMatcherIndices[116],
   },
   {
     /* [936] */
@@ -7615,37 +7647,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [938] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[118],
+    /* matcher indices */ &kMatcherIndices[124],
   },
   {
     /* [939] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[118],
+    /* matcher indices */ &kMatcherIndices[124],
   },
   {
     /* [940] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[118],
+    /* matcher indices */ &kMatcherIndices[124],
   },
   {
     /* [941] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[118],
+    /* matcher indices */ &kMatcherIndices[124],
   },
   {
     /* [942] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[118],
+    /* matcher indices */ &kMatcherIndices[124],
   },
   {
     /* [943] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[200],
+    /* matcher indices */ &kMatcherIndices[204],
   },
   {
     /* [944] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[108],
+    /* matcher indices */ &kMatcherIndices[112],
   },
   {
     /* [945] */
@@ -7670,37 +7702,37 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [949] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[98],
+    /* matcher indices */ &kMatcherIndices[106],
   },
   {
     /* [950] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[98],
+    /* matcher indices */ &kMatcherIndices[106],
   },
   {
     /* [951] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[98],
+    /* matcher indices */ &kMatcherIndices[106],
   },
   {
     /* [952] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[98],
+    /* matcher indices */ &kMatcherIndices[106],
   },
   {
     /* [953] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[98],
+    /* matcher indices */ &kMatcherIndices[106],
   },
   {
     /* [954] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[198],
+    /* matcher indices */ &kMatcherIndices[202],
   },
   {
     /* [955] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[114],
+    /* matcher indices */ &kMatcherIndices[120],
   },
   {
     /* [956] */
@@ -7750,32 +7782,32 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [965] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[134],
+    /* matcher indices */ &kMatcherIndices[144],
   },
   {
     /* [966] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[134],
+    /* matcher indices */ &kMatcherIndices[144],
   },
   {
     /* [967] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[134],
+    /* matcher indices */ &kMatcherIndices[144],
   },
   {
     /* [968] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[134],
+    /* matcher indices */ &kMatcherIndices[144],
   },
   {
     /* [969] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[196],
+    /* matcher indices */ &kMatcherIndices[200],
   },
   {
     /* [970] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[156],
+    /* matcher indices */ &kMatcherIndices[162],
   },
   {
     /* [971] */
@@ -7790,12 +7822,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [973] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[158],
+    /* matcher indices */ &kMatcherIndices[164],
   },
   {
     /* [974] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[162],
+    /* matcher indices */ &kMatcherIndices[166],
   },
   {
     /* [975] */
@@ -7805,7 +7837,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [976] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[164],
+    /* matcher indices */ &kMatcherIndices[168],
   },
   {
     /* [977] */
@@ -7820,12 +7852,12 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [979] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[170],
   },
   {
     /* [980] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[174],
   },
   {
     /* [981] */
@@ -7835,7 +7867,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [982] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[172],
+    /* matcher indices */ &kMatcherIndices[176],
   },
   {
     /* [983] */
@@ -7850,22 +7882,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [985] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[174],
+    /* matcher indices */ &kMatcherIndices[178],
   },
   {
     /* [986] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[176],
+    /* matcher indices */ &kMatcherIndices[180],
   },
   {
     /* [987] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[194],
+    /* matcher indices */ &kMatcherIndices[198],
   },
   {
     /* [988] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[178],
+    /* matcher indices */ &kMatcherIndices[182],
   },
   {
     /* [989] */
@@ -7880,22 +7912,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [991] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[180],
+    /* matcher indices */ &kMatcherIndices[184],
   },
   {
     /* [992] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[182],
+    /* matcher indices */ &kMatcherIndices[186],
   },
   {
     /* [993] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[192],
+    /* matcher indices */ &kMatcherIndices[196],
   },
   {
     /* [994] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[184],
+    /* matcher indices */ &kMatcherIndices[188],
   },
   {
     /* [995] */
@@ -7910,22 +7942,22 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [997] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[186],
+    /* matcher indices */ &kMatcherIndices[190],
   },
   {
     /* [998] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[188],
+    /* matcher indices */ &kMatcherIndices[192],
   },
   {
     /* [999] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[190],
+    /* matcher indices */ &kMatcherIndices[194],
   },
   {
     /* [1000] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[96],
+    /* matcher indices */ &kMatcherIndices[102],
   },
   {
     /* [1001] */
@@ -7940,7 +7972,7 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [1003] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[134],
+    /* matcher indices */ &kMatcherIndices[144],
   },
 };
 
@@ -7948,57 +7980,57 @@ constexpr TemplateTypeInfo kTemplateTypes[] = {
   {
     /* [0] */
     /* name */ "T",
-    /* matcher index */ 2,
+    /* matcher index */ 7,
   },
   {
     /* [1] */
     /* name */ "U",
-    /* matcher index */ 56,
+    /* matcher index */ 52,
   },
   {
     /* [2] */
     /* name */ "T",
-    /* matcher index */ 7,
+    /* matcher index */ 8,
   },
   {
     /* [3] */
     /* name */ "U",
-    /* matcher index */ 52,
+    /* matcher index */ 53,
   },
   {
     /* [4] */
     /* name */ "T",
-    /* matcher index */ 8,
+    /* matcher index */ 5,
   },
   {
     /* [5] */
     /* name */ "U",
-    /* matcher index */ 53,
+    /* matcher index */ 54,
   },
   {
     /* [6] */
     /* name */ "T",
-    /* matcher index */ 5,
+    /* matcher index */ 6,
   },
   {
     /* [7] */
     /* name */ "U",
-    /* matcher index */ 54,
+    /* matcher index */ 55,
   },
   {
     /* [8] */
     /* name */ "T",
-    /* matcher index */ 6,
+    /* matcher index */ 2,
   },
   {
     /* [9] */
     /* name */ "U",
-    /* matcher index */ 55,
+    /* matcher index */ 56,
   },
   {
     /* [10] */
     /* name */ "T",
-    /* matcher index */ 68,
+    /* matcher index */ 62,
   },
   {
     /* [11] */
@@ -8018,62 +8050,62 @@ constexpr TemplateTypeInfo kTemplateTypes[] = {
   {
     /* [14] */
     /* name */ "T",
-    /* matcher index */ 63,
+    /* matcher index */ 68,
   },
   {
     /* [15] */
     /* name */ "T",
-    /* matcher index */ 51,
+    /* matcher index */ 63,
   },
   {
     /* [16] */
     /* name */ "T",
-    /* matcher index */ 64,
+    /* matcher index */ 51,
   },
   {
     /* [17] */
     /* name */ "T",
-    /* matcher index */ 50,
+    /* matcher index */ 64,
   },
   {
     /* [18] */
     /* name */ "T",
-    /* matcher index */ kNoMatcher,
+    /* matcher index */ 50,
   },
   {
     /* [19] */
     /* name */ "T",
-    /* matcher index */ 56,
+    /* matcher index */ kNoMatcher,
   },
   {
     /* [20] */
     /* name */ "T",
-    /* matcher index */ 53,
+    /* matcher index */ 56,
   },
   {
     /* [21] */
     /* name */ "T",
-    /* matcher index */ 52,
+    /* matcher index */ 53,
   },
   {
     /* [22] */
     /* name */ "T",
-    /* matcher index */ 55,
+    /* matcher index */ 52,
   },
   {
     /* [23] */
     /* name */ "T",
-    /* matcher index */ 54,
+    /* matcher index */ 55,
   },
   {
     /* [24] */
     /* name */ "T",
-    /* matcher index */ 58,
+    /* matcher index */ 54,
   },
   {
     /* [25] */
     /* name */ "T",
-    /* matcher index */ 62,
+    /* matcher index */ 58,
   },
 };
 
@@ -8136,7 +8168,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[918],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -8148,7 +8180,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[617],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -8160,10 +8192,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[917],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8172,10 +8204,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[621],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8184,10 +8216,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[916],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8196,10 +8228,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[625],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8208,10 +8240,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[915],
-    /* return matcher indices */ &kMatcherIndices[104],
+    /* return matcher indices */ &kMatcherIndices[110],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8220,10 +8252,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[629],
-    /* return matcher indices */ &kMatcherIndices[104],
+    /* return matcher indices */ &kMatcherIndices[110],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8232,10 +8264,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[914],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8244,10 +8276,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[633],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8256,10 +8288,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[913],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8268,10 +8300,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[637],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8280,10 +8312,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[912],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8295,7 +8327,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[911],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8307,7 +8339,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[643],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8319,7 +8351,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[910],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8331,7 +8363,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[647],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8343,7 +8375,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[909],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8355,7 +8387,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[651],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8367,7 +8399,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[835],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8379,7 +8411,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[655],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8391,7 +8423,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[907],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8415,7 +8447,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[3],
     /* parameters */ &kParameters[904],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8427,7 +8459,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[3],
     /* parameters */ &kParameters[903],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8439,7 +8471,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[3],
     /* parameters */ &kParameters[902],
-    /* return matcher indices */ &kMatcherIndices[104],
+    /* return matcher indices */ &kMatcherIndices[110],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8451,7 +8483,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[901],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8460,10 +8492,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 0,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -8472,10 +8504,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[955],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -8484,10 +8516,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[956],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecSplat,
   },
@@ -8496,10 +8528,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 4,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[399],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorS,
   },
@@ -8508,10 +8540,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[564],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -8520,10 +8552,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[573],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -8532,10 +8564,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[576],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -8544,10 +8576,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[605],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -8556,10 +8588,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[603],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -8568,10 +8600,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[601],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -8580,10 +8612,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1003],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -8592,10 +8624,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[965],
-    /* return matcher indices */ &kMatcherIndices[140],
+    /* return matcher indices */ &kMatcherIndices[150],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -8604,10 +8636,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[6],
+    /* template types */ &kTemplateTypes[4],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[966],
-    /* return matcher indices */ &kMatcherIndices[144],
+    /* return matcher indices */ &kMatcherIndices[156],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -8616,10 +8648,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[8],
+    /* template types */ &kTemplateTypes[6],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[967],
-    /* return matcher indices */ &kMatcherIndices[150],
+    /* return matcher indices */ &kMatcherIndices[158],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -8628,10 +8660,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[0],
+    /* template types */ &kTemplateTypes[8],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[968],
-    /* return matcher indices */ &kMatcherIndices[154],
+    /* return matcher indices */ &kMatcherIndices[160],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -8643,7 +8675,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[510],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8655,7 +8687,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[507],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8667,7 +8699,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[351],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8679,7 +8711,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[347],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8691,7 +8723,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[230],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8703,7 +8735,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[495],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8715,7 +8747,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[331],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8727,7 +8759,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[489],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8739,7 +8771,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[327],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -8823,7 +8855,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[315],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8835,7 +8867,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[265],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8847,7 +8879,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[260],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8859,7 +8891,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[132],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8871,7 +8903,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[299],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8883,7 +8915,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[205],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8895,7 +8927,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[295],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8907,7 +8939,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[285],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -8991,7 +9023,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[471],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9000,10 +9032,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 4,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[431],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9012,10 +9044,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 5,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[250],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9024,10 +9056,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 5,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[215],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9036,10 +9068,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 6,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[96],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9048,10 +9080,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 4,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[407],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9060,10 +9092,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 5,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[170],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9075,7 +9107,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[558],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9087,7 +9119,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[387],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9099,7 +9131,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[379],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9111,7 +9143,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[160],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9123,7 +9155,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[585],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9135,7 +9167,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[375],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9288,10 +9320,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 0,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[108],
+    /* return matcher indices */ &kMatcherIndices[112],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -9300,10 +9332,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[944],
-    /* return matcher indices */ &kMatcherIndices[108],
+    /* return matcher indices */ &kMatcherIndices[112],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -9312,10 +9344,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[945],
-    /* return matcher indices */ &kMatcherIndices[108],
+    /* return matcher indices */ &kMatcherIndices[112],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecSplat,
   },
@@ -9324,10 +9356,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[588],
-    /* return matcher indices */ &kMatcherIndices[108],
+    /* return matcher indices */ &kMatcherIndices[112],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorS,
   },
@@ -9336,10 +9368,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[609],
-    /* return matcher indices */ &kMatcherIndices[108],
+    /* return matcher indices */ &kMatcherIndices[112],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -9348,10 +9380,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[607],
-    /* return matcher indices */ &kMatcherIndices[108],
+    /* return matcher indices */ &kMatcherIndices[112],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorM,
   },
@@ -9360,10 +9392,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[949],
-    /* return matcher indices */ &kMatcherIndices[100],
+    /* return matcher indices */ &kMatcherIndices[104],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9372,10 +9404,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[950],
-    /* return matcher indices */ &kMatcherIndices[102],
+    /* return matcher indices */ &kMatcherIndices[108],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9384,10 +9416,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[6],
+    /* template types */ &kTemplateTypes[4],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[951],
-    /* return matcher indices */ &kMatcherIndices[104],
+    /* return matcher indices */ &kMatcherIndices[110],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9396,10 +9428,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[8],
+    /* template types */ &kTemplateTypes[6],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[952],
-    /* return matcher indices */ &kMatcherIndices[110],
+    /* return matcher indices */ &kMatcherIndices[114],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9408,10 +9440,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[0],
+    /* template types */ &kTemplateTypes[8],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[953],
-    /* return matcher indices */ &kMatcherIndices[112],
+    /* return matcher indices */ &kMatcherIndices[118],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9420,7 +9452,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[880],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -9432,7 +9464,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[879],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -9444,7 +9476,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[878],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -9456,7 +9488,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[877],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -9468,7 +9500,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[876],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -9480,7 +9512,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[875],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -9540,7 +9572,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[727],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -9552,7 +9584,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[725],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -9564,7 +9596,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[723],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -9576,7 +9608,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[721],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -9648,10 +9680,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[522],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9660,10 +9692,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[528],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9672,10 +9704,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 4,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[363],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9684,10 +9716,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[531],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9696,10 +9728,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[549],
-    /* return matcher indices */ &kMatcherIndices[114],
+    /* return matcher indices */ &kMatcherIndices[120],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9747,7 +9779,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[783],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9756,10 +9788,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 0,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[106],
+    /* return matcher indices */ &kMatcherIndices[116],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -9768,10 +9800,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[935],
-    /* return matcher indices */ &kMatcherIndices[106],
+    /* return matcher indices */ &kMatcherIndices[116],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -9780,10 +9812,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[936],
-    /* return matcher indices */ &kMatcherIndices[106],
+    /* return matcher indices */ &kMatcherIndices[116],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecSplat,
   },
@@ -9792,10 +9824,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[17],
+    /* template types */ &kTemplateTypes[18],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[611],
-    /* return matcher indices */ &kMatcherIndices[106],
+    /* return matcher indices */ &kMatcherIndices[116],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::VecCtorS,
   },
@@ -9804,10 +9836,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[938],
-    /* return matcher indices */ &kMatcherIndices[128],
+    /* return matcher indices */ &kMatcherIndices[134],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9816,10 +9848,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[939],
-    /* return matcher indices */ &kMatcherIndices[126],
+    /* return matcher indices */ &kMatcherIndices[132],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9828,10 +9860,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[6],
+    /* template types */ &kTemplateTypes[4],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[940],
-    /* return matcher indices */ &kMatcherIndices[124],
+    /* return matcher indices */ &kMatcherIndices[130],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9840,10 +9872,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[8],
+    /* template types */ &kTemplateTypes[6],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[941],
-    /* return matcher indices */ &kMatcherIndices[122],
+    /* return matcher indices */ &kMatcherIndices[128],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9852,10 +9884,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 2,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[0],
+    /* template types */ &kTemplateTypes[8],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[942],
-    /* return matcher indices */ &kMatcherIndices[116],
+    /* return matcher indices */ &kMatcherIndices[122],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -9867,7 +9899,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[180],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9879,7 +9911,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[108],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9891,7 +9923,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[102],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9903,7 +9935,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[65],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9915,7 +9947,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[235],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9927,7 +9959,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[78],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9939,7 +9971,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[245],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9951,7 +9983,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[120],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -9963,7 +9995,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[343],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -9975,7 +10007,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[225],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -9987,7 +10019,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[150],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -9999,7 +10031,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[144],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -10011,7 +10043,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[439],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -10023,7 +10055,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[200],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -10035,7 +10067,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[435],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -10047,7 +10079,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[280],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline),
     /* const eval */ nullptr,
   },
@@ -10059,7 +10091,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[218],
+    /* return matcher indices */ &kMatcherIndices[224],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10071,7 +10103,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[922],
-    /* return matcher indices */ &kMatcherIndices[218],
+    /* return matcher indices */ &kMatcherIndices[224],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10083,7 +10115,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[0],
-    /* return matcher indices */ &kMatcherIndices[218],
+    /* return matcher indices */ &kMatcherIndices[224],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10095,7 +10127,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[443],
-    /* return matcher indices */ &kMatcherIndices[218],
+    /* return matcher indices */ &kMatcherIndices[224],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10104,10 +10136,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[908],
-    /* return matcher indices */ &kMatcherIndices[222],
+    /* return matcher indices */ &kMatcherIndices[228],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10116,10 +10148,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[906],
-    /* return matcher indices */ &kMatcherIndices[220],
+    /* return matcher indices */ &kMatcherIndices[226],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10203,7 +10235,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[172],
+    /* return matcher indices */ &kMatcherIndices[176],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10215,7 +10247,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[982],
-    /* return matcher indices */ &kMatcherIndices[172],
+    /* return matcher indices */ &kMatcherIndices[176],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10227,7 +10259,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[57],
-    /* return matcher indices */ &kMatcherIndices[172],
+    /* return matcher indices */ &kMatcherIndices[176],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10239,7 +10271,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[593],
-    /* return matcher indices */ &kMatcherIndices[172],
+    /* return matcher indices */ &kMatcherIndices[176],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10248,10 +10280,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[985],
-    /* return matcher indices */ &kMatcherIndices[176],
+    /* return matcher indices */ &kMatcherIndices[180],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10260,10 +10292,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[986],
-    /* return matcher indices */ &kMatcherIndices[174],
+    /* return matcher indices */ &kMatcherIndices[178],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10275,7 +10307,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[156],
+    /* return matcher indices */ &kMatcherIndices[162],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10287,7 +10319,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[970],
-    /* return matcher indices */ &kMatcherIndices[156],
+    /* return matcher indices */ &kMatcherIndices[162],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10299,7 +10331,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[411],
-    /* return matcher indices */ &kMatcherIndices[156],
+    /* return matcher indices */ &kMatcherIndices[162],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10311,7 +10343,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[597],
-    /* return matcher indices */ &kMatcherIndices[156],
+    /* return matcher indices */ &kMatcherIndices[162],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10320,10 +10352,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[973],
-    /* return matcher indices */ &kMatcherIndices[162],
+    /* return matcher indices */ &kMatcherIndices[166],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10332,10 +10364,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[974],
-    /* return matcher indices */ &kMatcherIndices[158],
+    /* return matcher indices */ &kMatcherIndices[164],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10419,7 +10451,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[367],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -10431,7 +10463,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[185],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -10443,7 +10475,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[190],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -10455,7 +10487,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[126],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -10467,7 +10499,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[355],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -10479,7 +10511,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[210],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -10491,7 +10523,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[164],
+    /* return matcher indices */ &kMatcherIndices[168],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10503,7 +10535,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[976],
-    /* return matcher indices */ &kMatcherIndices[164],
+    /* return matcher indices */ &kMatcherIndices[168],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10515,7 +10547,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[84],
-    /* return matcher indices */ &kMatcherIndices[164],
+    /* return matcher indices */ &kMatcherIndices[168],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10527,7 +10559,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[595],
-    /* return matcher indices */ &kMatcherIndices[164],
+    /* return matcher indices */ &kMatcherIndices[168],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10536,10 +10568,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[979],
-    /* return matcher indices */ &kMatcherIndices[170],
+    /* return matcher indices */ &kMatcherIndices[174],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10548,10 +10580,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[980],
-    /* return matcher indices */ &kMatcherIndices[168],
+    /* return matcher indices */ &kMatcherIndices[170],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10563,7 +10595,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[194],
+    /* return matcher indices */ &kMatcherIndices[198],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10575,7 +10607,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[987],
-    /* return matcher indices */ &kMatcherIndices[194],
+    /* return matcher indices */ &kMatcherIndices[198],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10587,7 +10619,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[49],
-    /* return matcher indices */ &kMatcherIndices[194],
+    /* return matcher indices */ &kMatcherIndices[198],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10599,7 +10631,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[415],
-    /* return matcher indices */ &kMatcherIndices[194],
+    /* return matcher indices */ &kMatcherIndices[198],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10608,10 +10640,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[969],
-    /* return matcher indices */ &kMatcherIndices[198],
+    /* return matcher indices */ &kMatcherIndices[202],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10620,10 +10652,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[954],
-    /* return matcher indices */ &kMatcherIndices[196],
+    /* return matcher indices */ &kMatcherIndices[200],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10635,7 +10667,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[200],
+    /* return matcher indices */ &kMatcherIndices[204],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10647,7 +10679,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[943],
-    /* return matcher indices */ &kMatcherIndices[200],
+    /* return matcher indices */ &kMatcherIndices[204],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10659,7 +10691,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[16],
-    /* return matcher indices */ &kMatcherIndices[200],
+    /* return matcher indices */ &kMatcherIndices[204],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10671,7 +10703,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[391],
-    /* return matcher indices */ &kMatcherIndices[200],
+    /* return matcher indices */ &kMatcherIndices[204],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10680,10 +10712,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[928],
-    /* return matcher indices */ &kMatcherIndices[212],
+    /* return matcher indices */ &kMatcherIndices[218],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10692,10 +10724,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[925],
-    /* return matcher indices */ &kMatcherIndices[210],
+    /* return matcher indices */ &kMatcherIndices[216],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10707,7 +10739,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[96],
+    /* return matcher indices */ &kMatcherIndices[102],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10719,7 +10751,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1000],
-    /* return matcher indices */ &kMatcherIndices[96],
+    /* return matcher indices */ &kMatcherIndices[102],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10731,7 +10763,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[28],
-    /* return matcher indices */ &kMatcherIndices[96],
+    /* return matcher indices */ &kMatcherIndices[102],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10743,7 +10775,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[468],
-    /* return matcher indices */ &kMatcherIndices[96],
+    /* return matcher indices */ &kMatcherIndices[102],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10752,10 +10784,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[999],
-    /* return matcher indices */ &kMatcherIndices[192],
+    /* return matcher indices */ &kMatcherIndices[196],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10764,10 +10796,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[993],
-    /* return matcher indices */ &kMatcherIndices[190],
+    /* return matcher indices */ &kMatcherIndices[194],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10779,7 +10811,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[184],
+    /* return matcher indices */ &kMatcherIndices[188],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10791,7 +10823,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[994],
-    /* return matcher indices */ &kMatcherIndices[184],
+    /* return matcher indices */ &kMatcherIndices[188],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10803,7 +10835,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[40],
-    /* return matcher indices */ &kMatcherIndices[184],
+    /* return matcher indices */ &kMatcherIndices[188],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10815,7 +10847,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[582],
-    /* return matcher indices */ &kMatcherIndices[184],
+    /* return matcher indices */ &kMatcherIndices[188],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10824,10 +10856,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[997],
-    /* return matcher indices */ &kMatcherIndices[188],
+    /* return matcher indices */ &kMatcherIndices[192],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10836,10 +10868,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[998],
-    /* return matcher indices */ &kMatcherIndices[186],
+    /* return matcher indices */ &kMatcherIndices[190],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10851,7 +10883,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[178],
+    /* return matcher indices */ &kMatcherIndices[182],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -10863,7 +10895,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[988],
-    /* return matcher indices */ &kMatcherIndices[178],
+    /* return matcher indices */ &kMatcherIndices[182],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -10875,7 +10907,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[114],
-    /* return matcher indices */ &kMatcherIndices[178],
+    /* return matcher indices */ &kMatcherIndices[182],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorS,
   },
@@ -10887,7 +10919,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[12],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[579],
-    /* return matcher indices */ &kMatcherIndices[178],
+    /* return matcher indices */ &kMatcherIndices[182],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::MatCtorV,
   },
@@ -10896,10 +10928,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[4],
+    /* template types */ &kTemplateTypes[2],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[991],
-    /* return matcher indices */ &kMatcherIndices[182],
+    /* return matcher indices */ &kMatcherIndices[186],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10908,10 +10940,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[2],
+    /* template types */ &kTemplateTypes[0],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[992],
-    /* return matcher indices */ &kMatcherIndices[180],
+    /* return matcher indices */ &kMatcherIndices[184],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -10920,7 +10952,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[737],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -10932,7 +10964,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[735],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -10944,7 +10976,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[733],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -10956,7 +10988,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[731],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -10980,7 +11012,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[885],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -10992,7 +11024,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[884],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -11100,7 +11132,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[701],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11112,7 +11144,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[699],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11124,7 +11156,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[695],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11136,7 +11168,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[693],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11172,7 +11204,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[683],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11184,7 +11216,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[681],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11220,7 +11252,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[675],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11232,7 +11264,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[673],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11244,7 +11276,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[709],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11256,7 +11288,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[707],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11268,7 +11300,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[705],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11280,7 +11312,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[781],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11316,7 +11348,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[23],
+    /* template types */ &kTemplateTypes[24],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[921],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -11352,7 +11384,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[19],
+    /* template types */ &kTemplateTypes[20],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[933],
     /* return matcher indices */ &kMatcherIndices[16],
@@ -11367,7 +11399,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1004],
-    /* return matcher indices */ &kMatcherIndices[103],
+    /* return matcher indices */ &kMatcherIndices[109],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Zero,
   },
@@ -11379,7 +11411,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[929],
-    /* return matcher indices */ &kMatcherIndices[103],
+    /* return matcher indices */ &kMatcherIndices[109],
     /* flags */ OverloadFlags(OverloadFlag::kIsConstructor, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Identity,
   },
@@ -11388,10 +11420,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[20],
+    /* template types */ &kTemplateTypes[21],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[930],
-    /* return matcher indices */ &kMatcherIndices[103],
+    /* return matcher indices */ &kMatcherIndices[109],
     /* flags */ OverloadFlags(OverloadFlag::kIsConverter, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ &ConstEval::Conv,
   },
@@ -11424,7 +11456,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[21],
+    /* template types */ &kTemplateTypes[22],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[927],
     /* return matcher indices */ &kMatcherIndices[4],
@@ -11436,7 +11468,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[540],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11448,7 +11480,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[543],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11460,7 +11492,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[546],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11496,7 +11528,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[22],
+    /* template types */ &kTemplateTypes[23],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[924],
     /* return matcher indices */ &kMatcherIndices[35],
@@ -11544,7 +11576,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[25],
+    /* template types */ &kTemplateTypes[10],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[860],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11556,7 +11588,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[25],
+    /* template types */ &kTemplateTypes[10],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[861],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11566,24 +11598,24 @@ constexpr OverloadInfo kOverloads[] = {
   {
     /* [286] */
     /* num parameters */ 1,
-    /* num template types */ 0,
+    /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[26],
+    /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[798],
-    /* return matcher indices */ &kMatcherIndices[233],
+    /* return matcher indices */ &kMatcherIndices[172],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
   {
     /* [287] */
     /* num parameters */ 1,
-    /* num template types */ 0,
+    /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[26],
+    /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[810],
-    /* return matcher indices */ &kMatcherIndices[166],
+    /* return matcher indices */ &kMatcherIndices[78],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -11664,7 +11696,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 4,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[423],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11676,7 +11708,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 4,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[427],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11808,7 +11840,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[763],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11820,7 +11852,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[761],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11832,7 +11864,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[759],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11844,7 +11876,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[757],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11878,24 +11910,24 @@ constexpr OverloadInfo kOverloads[] = {
   {
     /* [312] */
     /* num parameters */ 1,
-    /* num template types */ 0,
+    /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[26],
+    /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[855],
-    /* return matcher indices */ &kMatcherIndices[232],
+    /* return matcher indices */ &kMatcherIndices[136],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
   {
     /* [313] */
     /* num parameters */ 1,
-    /* num template types */ 0,
+    /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[26],
+    /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[856],
-    /* return matcher indices */ &kMatcherIndices[130],
+    /* return matcher indices */ &kMatcherIndices[96],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -11952,7 +11984,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[806],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11964,7 +11996,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[805],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -11976,7 +12008,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[459],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -11988,7 +12020,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[456],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12144,7 +12176,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[889],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -12156,7 +12188,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[890],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12360,7 +12392,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[804],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -12372,7 +12404,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[803],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12504,7 +12536,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[619],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -12516,7 +12548,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[615],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12552,7 +12584,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[635],
     /* return matcher indices */ &kMatcherIndices[16],
@@ -12564,7 +12596,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[631],
     /* return matcher indices */ &kMatcherIndices[39],
@@ -12576,7 +12608,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[641],
     /* return matcher indices */ &kMatcherIndices[16],
@@ -12588,7 +12620,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[639],
     /* return matcher indices */ &kMatcherIndices[39],
@@ -12600,7 +12632,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[649],
     /* return matcher indices */ &kMatcherIndices[16],
@@ -12612,7 +12644,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[645],
     /* return matcher indices */ &kMatcherIndices[39],
@@ -12672,7 +12704,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[1002],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -12684,7 +12716,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[996],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12696,7 +12728,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[832],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -12708,7 +12740,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[831],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12720,7 +12752,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[834],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -12732,7 +12764,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[833],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12744,7 +12776,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[16],
+    /* template types */ &kTemplateTypes[17],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[870],
     /* return matcher indices */ &kMatcherIndices[34],
@@ -12768,7 +12800,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[837],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -12780,7 +12812,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[836],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -12792,7 +12824,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[657],
     /* return matcher indices */ &kMatcherIndices[16],
@@ -12804,7 +12836,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[653],
     /* return matcher indices */ &kMatcherIndices[39],
@@ -12960,7 +12992,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[659],
     /* return matcher indices */ &kMatcherIndices[16],
@@ -12972,7 +13004,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[599],
     /* return matcher indices */ &kMatcherIndices[39],
@@ -12984,7 +13016,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[663],
     /* return matcher indices */ &kMatcherIndices[16],
@@ -12996,7 +13028,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[15],
+    /* template types */ &kTemplateTypes[16],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[661],
     /* return matcher indices */ &kMatcherIndices[39],
@@ -13056,7 +13088,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[691],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13068,7 +13100,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[689],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -13200,7 +13232,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[24],
+    /* template types */ &kTemplateTypes[25],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[862],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13212,7 +13244,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[24],
+    /* template types */ &kTemplateTypes[25],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[863],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -13248,7 +13280,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 0,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[627],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13260,7 +13292,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[623],
     /* return matcher indices */ &kMatcherIndices[30],
@@ -13272,10 +13304,10 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 3,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[561],
-    /* return matcher indices */ &kMatcherIndices[202],
+    /* return matcher indices */ &kMatcherIndices[206],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -13284,7 +13316,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[753],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13296,7 +13328,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[755],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13308,7 +13340,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[765],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13320,7 +13352,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[767],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13332,7 +13364,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[769],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13344,7 +13376,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[771],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13356,7 +13388,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[773],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13368,7 +13400,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[775],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13404,7 +13436,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[591],
     /* return matcher indices */ nullptr,
@@ -13416,7 +13448,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[10],
+    /* template types */ &kTemplateTypes[14],
     /* template numbers */ &kTemplateNumbers[9],
     /* parameters */ &kParameters[847],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13455,7 +13487,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[937],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -13467,7 +13499,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[947],
-    /* return matcher indices */ &kMatcherIndices[120],
+    /* return matcher indices */ &kMatcherIndices[126],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -13479,7 +13511,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[948],
-    /* return matcher indices */ &kMatcherIndices[128],
+    /* return matcher indices */ &kMatcherIndices[134],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -13491,7 +13523,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[961],
-    /* return matcher indices */ &kMatcherIndices[128],
+    /* return matcher indices */ &kMatcherIndices[134],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -13503,7 +13535,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[26],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[962],
-    /* return matcher indices */ &kMatcherIndices[128],
+    /* return matcher indices */ &kMatcherIndices[134],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -13611,7 +13643,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* template types */ &kTemplateTypes[11],
     /* template numbers */ &kTemplateNumbers[10],
     /* parameters */ &kParameters[785],
-    /* return matcher indices */ &kMatcherIndices[108],
+    /* return matcher indices */ &kMatcherIndices[112],
     /* flags */ OverloadFlags(OverloadFlag::kIsBuiltin, OverloadFlag::kSupportsVertexPipeline, OverloadFlag::kSupportsFragmentPipeline, OverloadFlag::kSupportsComputePipeline),
     /* const eval */ nullptr,
   },
@@ -13656,7 +13688,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 2,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[14],
+    /* template types */ &kTemplateTypes[15],
     /* template numbers */ &kTemplateNumbers[6],
     /* parameters */ &kParameters[791],
     /* return matcher indices */ &kMatcherIndices[1],
@@ -13680,7 +13712,7 @@ constexpr OverloadInfo kOverloads[] = {
     /* num parameters */ 1,
     /* num template types */ 1,
     /* num template numbers */ 1,
-    /* template types */ &kTemplateTypes[18],
+    /* template types */ &kTemplateTypes[19],
     /* template numbers */ &kTemplateNumbers[8],
     /* parameters */ &kParameters[960],
     /* return matcher indices */ &kMatcherIndices[35],
@@ -13977,8 +14009,8 @@ constexpr IntrinsicInfo kBuiltins[] = {
   },
   {
     /* [40] */
-    /* fn frexp(f32) -> __frexp_result */
-    /* fn frexp<N : num>(vec<N, f32>) -> __frexp_result_vec<N> */
+    /* fn frexp<T : f32_f16>(T) -> __frexp_result<T> */
+    /* fn frexp<N : num, T : f32_f16>(vec<N, T>) -> __frexp_result_vec<N, T> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[286],
   },
@@ -14069,8 +14101,8 @@ constexpr IntrinsicInfo kBuiltins[] = {
   },
   {
     /* [53] */
-    /* fn modf(f32) -> __modf_result */
-    /* fn modf<N : num>(vec<N, f32>) -> __modf_result_vec<N> */
+    /* fn modf<T : f32_f16>(T) -> __modf_result<T> */
+    /* fn modf<N : num, T : f32_f16>(vec<N, T>) -> __modf_result_vec<N, T> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[312],
   },
diff --git a/src/tint/writer/glsl/generator_impl.cc b/src/tint/writer/glsl/generator_impl.cc
index b7a3be64c4..c66e1744b9 100644
--- a/src/tint/writer/glsl/generator_impl.cc
+++ b/src/tint/writer/glsl/generator_impl.cc
@@ -1205,97 +1205,51 @@ bool GeneratorImpl::EmitDotCall(std::ostream& out,
 bool GeneratorImpl::EmitModfCall(std::ostream& out,
                                  const ast::CallExpression* expr,
                                  const sem::Builtin* builtin) {
-    if (expr->args.Length() == 1) {
-        return CallBuiltinHelper(
-            out, expr, builtin, [&](TextBuffer* b, const std::vector<std::string>& params) {
-                // Emit the builtin return type unique to this overload. This does not
-                // exist in the AST, so it will not be generated in Generate().
-                if (!EmitStructType(&helpers_, builtin->ReturnType()->As<sem::Struct>())) {
+    TINT_ASSERT(Writer, expr->args.Length() == 1);
+    return CallBuiltinHelper(
+        out, expr, builtin, [&](TextBuffer* b, const std::vector<std::string>& params) {
+            // Emit the builtin return type unique to this overload. This does not
+            // exist in the AST, so it will not be generated in Generate().
+            if (!EmitStructType(&helpers_, builtin->ReturnType()->As<sem::Struct>())) {
+                return false;
+            }
+
+            {
+                auto l = line(b);
+                if (!EmitType(l, builtin->ReturnType(), ast::StorageClass::kNone,
+                              ast::Access::kUndefined, "")) {
                     return false;
                 }
-
-                {
-                    auto l = line(b);
-                    if (!EmitType(l, builtin->ReturnType(), ast::StorageClass::kNone,
-                                  ast::Access::kUndefined, "")) {
-                        return false;
-                    }
-                    l << " result;";
-                }
-                line(b) << "result.fract = modf(" << params[0] << ", result.whole);";
-                line(b) << "return result;";
-                return true;
-            });
-    }
-
-    // DEPRECATED
-    out << "modf";
-    ScopedParen sp(out);
-    if (!EmitExpression(out, expr->args[0])) {
-        return false;
-    }
-    out << ", ";
-    if (!EmitExpression(out, expr->args[1])) {
-        return false;
-    }
-    return true;
+                l << " result;";
+            }
+            line(b) << "result.fract = modf(" << params[0] << ", result.whole);";
+            line(b) << "return result;";
+            return true;
+        });
 }
 
 bool GeneratorImpl::EmitFrexpCall(std::ostream& out,
                                   const ast::CallExpression* expr,
                                   const sem::Builtin* builtin) {
-    if (expr->args.Length() == 1) {
-        return CallBuiltinHelper(
-            out, expr, builtin, [&](TextBuffer* b, const std::vector<std::string>& params) {
-                // Emit the builtin return type unique to this overload. This does not
-                // exist in the AST, so it will not be generated in Generate().
-                if (!EmitStructType(&helpers_, builtin->ReturnType()->As<sem::Struct>())) {
-                    return false;
-                }
-
-                {
-                    auto l = line(b);
-                    if (!EmitType(l, builtin->ReturnType(), ast::StorageClass::kNone,
-                                  ast::Access::kUndefined, "")) {
-                        return false;
-                    }
-                    l << " result;";
-                }
-                line(b) << "result.sig = frexp(" << params[0] << ", result.exp);";
-                line(b) << "return result;";
-                return true;
-            });
-    }
-    // DEPRECATED
-    // Exponent is an integer in WGSL, but HLSL wants a float.
-    // We need to make the call with a temporary float, and then cast.
+    TINT_ASSERT(Writer, expr->args.Length() == 1);
     return CallBuiltinHelper(
         out, expr, builtin, [&](TextBuffer* b, const std::vector<std::string>& params) {
-            auto* significand_ty = builtin->Parameters()[0]->Type();
-            auto significand = params[0];
-            auto* exponent_ty = builtin->Parameters()[1]->Type();
-            auto exponent = params[1];
-
-            std::string width;
-            if (auto* vec = significand_ty->As<sem::Vector>()) {
-                width = std::to_string(vec->Width());
+            // Emit the builtin return type unique to this overload. This does not
+            // exist in the AST, so it will not be generated in Generate().
+            if (!EmitStructType(&helpers_, builtin->ReturnType()->As<sem::Struct>())) {
+                return false;
             }
 
-            // Exponent is an integer, which HLSL does not have an overload for.
-            // We need to cast from a float.
-            line(b) << "float" << width << " float_exp;";
-            line(b) << "float" << width << " significand = frexp(" << significand
-                    << ", float_exp);";
             {
                 auto l = line(b);
-                l << exponent << " = ";
-                if (!EmitType(l, exponent_ty->UnwrapPtr(), ast::StorageClass::kNone,
+                if (!EmitType(l, builtin->ReturnType(), ast::StorageClass::kNone,
                               ast::Access::kUndefined, "")) {
                     return false;
                 }
-                l << "(float_exp);";
+                l << " result;";
             }
-            line(b) << "return significand;";
+            line(b) << "result.sig = frexp(" << params[0] << ", result.exp);";
+            line(b) << "return result;";
             return true;
         });
 }
diff --git a/src/tint/writer/glsl/generator_impl_builtin_test.cc b/src/tint/writer/glsl/generator_impl_builtin_test.cc
index c7c8d53cae..b8161e2ea2 100644
--- a/src/tint/writer/glsl/generator_impl_builtin_test.cc
+++ b/src/tint/writer/glsl/generator_impl_builtin_test.cc
@@ -412,7 +412,7 @@ TEST_F(GlslGeneratorImplTest_Builtin, FMA_f16) {
     EXPECT_EQ(out.str(), "((a) * (b) + (c))");
 }
 
-TEST_F(GlslGeneratorImplTest_Builtin, Modf_Scalar) {
+TEST_F(GlslGeneratorImplTest_Builtin, Modf_Scalar_f32) {
     auto* call = Call("modf", 1_f);
     WrapInFunction(CallStmt(call));
 
@@ -445,7 +445,43 @@ void main() {
 )");
 }
 
-TEST_F(GlslGeneratorImplTest_Builtin, Modf_Vector) {
+TEST_F(GlslGeneratorImplTest_Builtin, Modf_Scalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", 1_h);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#version 310 es
+#extension GL_AMD_gpu_shader_half_float : require
+
+struct modf_result_f16 {
+  float16_t fract;
+  float16_t whole;
+};
+
+modf_result_f16 tint_modf(float16_t param_0) {
+  modf_result_f16 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+
+void test_function() {
+  tint_modf(1.0hf);
+}
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+  test_function();
+  return;
+}
+)");
+}
+
+TEST_F(GlslGeneratorImplTest_Builtin, Modf_Vector_f32) {
     auto* call = Call("modf", vec3<f32>());
     WrapInFunction(CallStmt(call));
 
@@ -478,7 +514,43 @@ void main() {
 )");
 }
 
-TEST_F(GlslGeneratorImplTest_Builtin, Frexp_Scalar_i32) {
+TEST_F(GlslGeneratorImplTest_Builtin, Modf_Vector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", vec3<f16>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#version 310 es
+#extension GL_AMD_gpu_shader_half_float : require
+
+struct modf_result_vec3_f16 {
+  f16vec3 fract;
+  f16vec3 whole;
+};
+
+modf_result_vec3_f16 tint_modf(f16vec3 param_0) {
+  modf_result_vec3_f16 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+
+void test_function() {
+  tint_modf(f16vec3(0.0hf));
+}
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+  test_function();
+  return;
+}
+)");
+}
+
+TEST_F(GlslGeneratorImplTest_Builtin, Frexp_Scalar_f32) {
     auto* call = Call("frexp", 1_f);
     WrapInFunction(CallStmt(call));
 
@@ -505,7 +577,42 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 )"));
 }
 
-TEST_F(GlslGeneratorImplTest_Builtin, Frexp_Vector_i32) {
+TEST_F(GlslGeneratorImplTest_Builtin, Frexp_Scalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", 1_h);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_THAT(gen.result(), HasSubstr(R"(#version 310 es
+#extension GL_AMD_gpu_shader_half_float : require
+
+struct frexp_result_f16 {
+  float16_t sig;
+  int exp;
+};
+
+frexp_result_f16 tint_frexp(float16_t param_0) {
+  frexp_result_f16 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
+}
+
+
+void test_function() {
+  tint_frexp(1.0hf);
+}
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+  test_function();
+  return;
+)"));
+}
+
+TEST_F(GlslGeneratorImplTest_Builtin, Frexp_Vector_f32) {
     auto* call = Call("frexp", vec3<f32>());
     WrapInFunction(CallStmt(call));
 
@@ -537,6 +644,42 @@ void main() {
 )"));
 }
 
+TEST_F(GlslGeneratorImplTest_Builtin, Frexp_Vector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", vec3<f16>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_THAT(gen.result(), HasSubstr(R"(#version 310 es
+#extension GL_AMD_gpu_shader_half_float : require
+
+struct frexp_result_vec3_f16 {
+  f16vec3 sig;
+  ivec3 exp;
+};
+
+frexp_result_vec3_f16 tint_frexp(f16vec3 param_0) {
+  frexp_result_vec3_f16 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
+}
+
+
+void test_function() {
+  tint_frexp(f16vec3(0.0hf));
+}
+
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+void main() {
+  test_function();
+  return;
+}
+)"));
+}
+
 TEST_F(GlslGeneratorImplTest_Builtin, Degrees_Scalar_f32) {
     auto* val = Var("val", ty.f32());
     auto* call = Call("degrees", val);
diff --git a/src/tint/writer/hlsl/generator_impl.cc b/src/tint/writer/hlsl/generator_impl.cc
index 726a459cff..444746cc0d 100644
--- a/src/tint/writer/hlsl/generator_impl.cc
+++ b/src/tint/writer/hlsl/generator_impl.cc
@@ -1855,16 +1855,15 @@ bool GeneratorImpl::EmitModfCall(std::ostream& out,
                 return false;
             }
 
-            line(b) << "float" << width << " whole;";
-            line(b) << "float" << width << " fract = modf(" << in << ", whole);";
             {
                 auto l = line(b);
                 if (!EmitType(l, builtin->ReturnType(), ast::StorageClass::kNone,
                               ast::Access::kUndefined, "")) {
                     return false;
                 }
-                l << " result = {fract, whole};";
+                l << " result;";
             }
+            line(b) << "result.fract = modf(" << params[0] << ", result.whole);";
             line(b) << "return result;";
             return true;
         });
@@ -1889,8 +1888,15 @@ bool GeneratorImpl::EmitFrexpCall(std::ostream& out,
                 return false;
             }
 
-            line(b) << "float" << width << " exp;";
-            line(b) << "float" << width << " sig = frexp(" << in << ", exp);";
+            std::string member_type;
+            if (Is<sem::F16>(sem::Type::DeepestElementOf(ty))) {
+                member_type = width.empty() ? "float16_t" : ("vector<float16_t, " + width + ">");
+            } else {
+                member_type = "float" + width;
+            }
+
+            line(b) << member_type << " exp;";
+            line(b) << member_type << " sig = frexp(" << in << ", exp);";
             {
                 auto l = line(b);
                 if (!EmitType(l, builtin->ReturnType(), ast::StorageClass::kNone,
diff --git a/src/tint/writer/hlsl/generator_impl_builtin_test.cc b/src/tint/writer/hlsl/generator_impl_builtin_test.cc
index 82c7e7e2a7..3f9cfa79a8 100644
--- a/src/tint/writer/hlsl/generator_impl_builtin_test.cc
+++ b/src/tint/writer/hlsl/generator_impl_builtin_test.cc
@@ -377,7 +377,7 @@ TEST_F(HlslGeneratorImplTest_Builtin, Select_Vector) {
     EXPECT_EQ(out.str(), "(bool2(true, false) ? int2(3, 4) : int2(1, 2))");
 }
 
-TEST_F(HlslGeneratorImplTest_Builtin, Modf_Scalar) {
+TEST_F(HlslGeneratorImplTest_Builtin, Modf_Scalar_f32) {
     auto* call = Call("modf", 1_f);
     WrapInFunction(CallStmt(call));
 
@@ -389,9 +389,8 @@ TEST_F(HlslGeneratorImplTest_Builtin, Modf_Scalar) {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
@@ -403,7 +402,34 @@ void test_function() {
 )");
 }
 
-TEST_F(HlslGeneratorImplTest_Builtin, Modf_Vector) {
+TEST_F(HlslGeneratorImplTest_Builtin, Modf_Scalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", 1_h);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(struct modf_result_f16 {
+  float16_t fract;
+  float16_t whole;
+};
+modf_result_f16 tint_modf(float16_t param_0) {
+  modf_result_f16 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+[numthreads(1, 1, 1)]
+void test_function() {
+  tint_modf(float16_t(1.0h));
+  return;
+}
+)");
+}
+
+TEST_F(HlslGeneratorImplTest_Builtin, Modf_Vector_f32) {
     auto* call = Call("modf", vec3<f32>());
     WrapInFunction(CallStmt(call));
 
@@ -415,9 +441,8 @@ TEST_F(HlslGeneratorImplTest_Builtin, Modf_Vector) {
   float3 whole;
 };
 modf_result_vec3 tint_modf(float3 param_0) {
-  float3 whole;
-  float3 fract = modf(param_0, whole);
-  modf_result_vec3 result = {fract, whole};
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
@@ -429,7 +454,34 @@ void test_function() {
 )");
 }
 
-TEST_F(HlslGeneratorImplTest_Builtin, Frexp_Scalar_i32) {
+TEST_F(HlslGeneratorImplTest_Builtin, Modf_Vector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", vec3<f16>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(struct modf_result_vec3_f16 {
+  vector<float16_t, 3> fract;
+  vector<float16_t, 3> whole;
+};
+modf_result_vec3_f16 tint_modf(vector<float16_t, 3> param_0) {
+  modf_result_vec3_f16 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+[numthreads(1, 1, 1)]
+void test_function() {
+  tint_modf((float16_t(0.0h)).xxx);
+  return;
+}
+)");
+}
+
+TEST_F(HlslGeneratorImplTest_Builtin, Frexp_Scalar_f32) {
     auto* call = Call("frexp", 1_f);
     WrapInFunction(CallStmt(call));
 
@@ -455,7 +507,35 @@ void test_function() {
 )");
 }
 
-TEST_F(HlslGeneratorImplTest_Builtin, Frexp_Vector_i32) {
+TEST_F(HlslGeneratorImplTest_Builtin, Frexp_Scalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", 1_h);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(struct frexp_result_f16 {
+  float16_t sig;
+  int exp;
+};
+frexp_result_f16 tint_frexp(float16_t param_0) {
+  float16_t exp;
+  float16_t sig = frexp(param_0, exp);
+  frexp_result_f16 result = {sig, int(exp)};
+  return result;
+}
+
+[numthreads(1, 1, 1)]
+void test_function() {
+  tint_frexp(float16_t(1.0h));
+  return;
+}
+)");
+}
+
+TEST_F(HlslGeneratorImplTest_Builtin, Frexp_Vector_f32) {
     auto* call = Call("frexp", vec3<f32>());
     WrapInFunction(CallStmt(call));
 
@@ -481,6 +561,34 @@ void test_function() {
 )");
 }
 
+TEST_F(HlslGeneratorImplTest_Builtin, Frexp_Vector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", vec3<f16>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(struct frexp_result_vec3_f16 {
+  vector<float16_t, 3> sig;
+  int3 exp;
+};
+frexp_result_vec3_f16 tint_frexp(vector<float16_t, 3> param_0) {
+  vector<float16_t, 3> exp;
+  vector<float16_t, 3> sig = frexp(param_0, exp);
+  frexp_result_vec3_f16 result = {sig, int3(exp)};
+  return result;
+}
+
+[numthreads(1, 1, 1)]
+void test_function() {
+  tint_frexp((float16_t(0.0h)).xxx);
+  return;
+}
+)");
+}
+
 TEST_F(HlslGeneratorImplTest_Builtin, Degrees_Scalar_f32) {
     auto* val = Var("val", ty.f32());
     auto* call = Call("degrees", val);
diff --git a/src/tint/writer/msl/generator_impl.cc b/src/tint/writer/msl/generator_impl.cc
index 577ecd733f..28d2c1012d 100644
--- a/src/tint/writer/msl/generator_impl.cc
+++ b/src/tint/writer/msl/generator_impl.cc
@@ -1308,9 +1308,9 @@ bool GeneratorImpl::EmitModfCall(std::ostream& out,
                 return false;
             }
 
-            line(b) << "float" << width << " whole;";
-            line(b) << "float" << width << " fract = modf(" << in << ", whole);";
-            line(b) << "return {fract, whole};";
+            line(b) << StructName(builtin->ReturnType()->As<sem::Struct>()) << " result;";
+            line(b) << "result.fract = modf(" << in << ", result.whole);";
+            line(b) << "return result;";
             return true;
         });
 }
@@ -1334,9 +1334,9 @@ bool GeneratorImpl::EmitFrexpCall(std::ostream& out,
                 return false;
             }
 
-            line(b) << "int" << width << " exp;";
-            line(b) << "float" << width << " sig = frexp(" << in << ", exp);";
-            line(b) << "return {sig, exp};";
+            line(b) << StructName(builtin->ReturnType()->As<sem::Struct>()) << " result;";
+            line(b) << "result.sig = frexp(" << in << ", result.exp);";
+            line(b) << "return result;";
             return true;
         });
 }
diff --git a/src/tint/writer/msl/generator_impl_builtin_test.cc b/src/tint/writer/msl/generator_impl_builtin_test.cc
index b97a1083b7..9f75691237 100644
--- a/src/tint/writer/msl/generator_impl_builtin_test.cc
+++ b/src/tint/writer/msl/generator_impl_builtin_test.cc
@@ -405,6 +405,246 @@ TEST_F(MslGeneratorImplTest, WorkgroupBarrier) {
     EXPECT_EQ(out.str(), "threadgroup_barrier(mem_flags::mem_threadgroup)");
 }
 
+TEST_F(MslGeneratorImplTest, Modf_Scalar_f32) {
+    auto* call = Call("modf", 1_f);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct modf_result {
+  float fract;
+  float whole;
+};
+modf_result tint_modf(float param_0) {
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+kernel void test_function() {
+  tint_modf(1.0f);
+  return;
+}
+
+)");
+}
+
+TEST_F(MslGeneratorImplTest, Modf_Scalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", 1_h);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct modf_result_f16 {
+  half fract;
+  half whole;
+};
+modf_result_f16 tint_modf(half param_0) {
+  modf_result_f16 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+kernel void test_function() {
+  tint_modf(1.0h);
+  return;
+}
+
+)");
+}
+
+TEST_F(MslGeneratorImplTest, Modf_Vector_f32) {
+    auto* call = Call("modf", vec3<f32>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct modf_result_vec3 {
+  float3 fract;
+  float3 whole;
+};
+modf_result_vec3 tint_modf(float3 param_0) {
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+kernel void test_function() {
+  tint_modf(float3(0.0f));
+  return;
+}
+
+)");
+}
+
+TEST_F(MslGeneratorImplTest, Modf_Vector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("modf", vec3<f16>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct modf_result_vec3_f16 {
+  half3 fract;
+  half3 whole;
+};
+modf_result_vec3_f16 tint_modf(half3 param_0) {
+  modf_result_vec3_f16 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
+}
+
+kernel void test_function() {
+  tint_modf(half3(0.0h));
+  return;
+}
+
+)");
+}
+
+TEST_F(MslGeneratorImplTest, Frexp_Scalar_f32) {
+    auto* call = Call("frexp", 1_f);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct frexp_result {
+  float sig;
+  int exp;
+};
+frexp_result tint_frexp(float param_0) {
+  frexp_result result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
+}
+
+kernel void test_function() {
+  tint_frexp(1.0f);
+  return;
+}
+
+)");
+}
+
+TEST_F(MslGeneratorImplTest, Frexp_Scalar_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", 1_h);
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct frexp_result_f16 {
+  half sig;
+  int exp;
+};
+frexp_result_f16 tint_frexp(half param_0) {
+  frexp_result_f16 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
+}
+
+kernel void test_function() {
+  tint_frexp(1.0h);
+  return;
+}
+
+)");
+}
+
+TEST_F(MslGeneratorImplTest, Frexp_Vector_f32) {
+    auto* call = Call("frexp", vec3<f32>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct frexp_result_vec3 {
+  float3 sig;
+  int3 exp;
+};
+frexp_result_vec3 tint_frexp(float3 param_0) {
+  frexp_result_vec3 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
+}
+
+kernel void test_function() {
+  tint_frexp(float3(0.0f));
+  return;
+}
+
+)");
+}
+
+TEST_F(MslGeneratorImplTest, Frexp_Vector_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* call = Call("frexp", vec3<f16>());
+    WrapInFunction(CallStmt(call));
+
+    GeneratorImpl& gen = SanitizeAndBuild();
+
+    ASSERT_TRUE(gen.Generate()) << gen.error();
+    EXPECT_EQ(gen.result(), R"(#include <metal_stdlib>
+
+using namespace metal;
+
+struct frexp_result_vec3_f16 {
+  half3 sig;
+  int3 exp;
+};
+frexp_result_vec3_f16 tint_frexp(half3 param_0) {
+  frexp_result_vec3_f16 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
+}
+
+kernel void test_function() {
+  tint_frexp(half3(0.0h));
+  return;
+}
+
+)");
+}
+
 TEST_F(MslGeneratorImplTest, Degrees_Scalar_f32) {
     auto* val = Var("val", ty.f32());
     auto* call = Call("degrees", val);
diff --git a/src/tint/writer/spirv/builder_builtin_test.cc b/src/tint/writer/spirv/builder_builtin_test.cc
index 1faf4747b7..52254d2d40 100644
--- a/src/tint/writer/spirv/builder_builtin_test.cc
+++ b/src/tint/writer/spirv/builder_builtin_test.cc
@@ -1651,7 +1651,7 @@ OpFunctionEnd
     EXPECT_EQ(got, expect);
 }
 
-TEST_F(BuiltinBuilderTest, Call_Modf) {
+TEST_F(BuiltinBuilderTest, Call_Modf_f32) {
     auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 2_f));
     auto* expr = Call("modf", vec);
     Func("a_func", utils::Empty, ty.void_(),
@@ -1703,7 +1703,65 @@ OpFunctionEnd
     Validate(b);
 }
 
-TEST_F(BuiltinBuilderTest, Call_Frexp) {
+TEST_F(BuiltinBuilderTest, Call_Modf_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 2_h));
+    auto* expr = Call("modf", vec);
+    Func("a_func", utils::Empty, ty.void_(),
+         utils::Vector{
+             Decl(vec),
+             CallStmt(expr),
+         },
+         utils::Vector{
+             Stage(ast::PipelineStage::kFragment),
+         });
+
+    spirv::Builder& b = Build();
+
+    ASSERT_TRUE(b.Build()) << b.error();
+    auto got = DumpBuilder(b);
+    auto* expect = R"(OpCapability Shader
+OpCapability Float16
+OpCapability UniformAndStorageBuffer16BitAccess
+OpCapability StorageBuffer16BitAccess
+OpCapability StorageInputOutput16
+%15 = OpExtInstImport "GLSL.std.450"
+OpMemoryModel Logical GLSL450
+OpEntryPoint Fragment %3 "a_func"
+OpExecutionMode %3 OriginUpperLeft
+OpName %3 "a_func"
+OpName %10 "vec"
+OpName %14 "__modf_result_vec2_f16"
+OpMemberName %14 0 "fract"
+OpMemberName %14 1 "whole"
+OpMemberDecorate %14 0 Offset 0
+OpMemberDecorate %14 1 Offset 4
+%2 = OpTypeVoid
+%1 = OpTypeFunction %2
+%6 = OpTypeFloat 16
+%5 = OpTypeVector %6 2
+%7 = OpConstant %6 0x1p+0
+%8 = OpConstant %6 0x1p+1
+%9 = OpConstantComposite %5 %7 %8
+%11 = OpTypePointer Function %5
+%12 = OpConstantNull %5
+%14 = OpTypeStruct %5 %5
+%3 = OpFunction %2 None %1
+%4 = OpLabel
+%10 = OpVariable %11 Function %12
+OpStore %10 %9
+%16 = OpLoad %5 %10
+%13 = OpExtInst %14 %15 ModfStruct %16
+OpReturn
+OpFunctionEnd
+)";
+    EXPECT_EQ(expect, got);
+
+    Validate(b);
+}
+
+TEST_F(BuiltinBuilderTest, Call_Frexp_f32) {
     auto* vec = Var("vec", nullptr, vec2<f32>(1_f, 2_f));
     auto* expr = Call("frexp", vec);
     Func("a_func", utils::Empty, ty.void_(),
@@ -1757,6 +1815,66 @@ OpFunctionEnd
     Validate(b);
 }
 
+TEST_F(BuiltinBuilderTest, Call_Frexp_f16) {
+    Enable(ast::Extension::kF16);
+
+    auto* vec = Var("vec", nullptr, vec2<f16>(1_h, 2_h));
+    auto* expr = Call("frexp", vec);
+    Func("a_func", utils::Empty, ty.void_(),
+         utils::Vector{
+             Decl(vec),
+             CallStmt(expr),
+         },
+         utils::Vector{
+             Stage(ast::PipelineStage::kFragment),
+         });
+
+    spirv::Builder& b = Build();
+
+    ASSERT_TRUE(b.Build()) << b.error();
+    auto got = DumpBuilder(b);
+    auto* expect = R"(OpCapability Shader
+OpCapability Float16
+OpCapability UniformAndStorageBuffer16BitAccess
+OpCapability StorageBuffer16BitAccess
+OpCapability StorageInputOutput16
+%17 = OpExtInstImport "GLSL.std.450"
+OpMemoryModel Logical GLSL450
+OpEntryPoint Fragment %3 "a_func"
+OpExecutionMode %3 OriginUpperLeft
+OpName %3 "a_func"
+OpName %10 "vec"
+OpName %14 "__frexp_result_vec2_f16"
+OpMemberName %14 0 "sig"
+OpMemberName %14 1 "exp"
+OpMemberDecorate %14 0 Offset 0
+OpMemberDecorate %14 1 Offset 8
+%2 = OpTypeVoid
+%1 = OpTypeFunction %2
+%6 = OpTypeFloat 16
+%5 = OpTypeVector %6 2
+%7 = OpConstant %6 0x1p+0
+%8 = OpConstant %6 0x1p+1
+%9 = OpConstantComposite %5 %7 %8
+%11 = OpTypePointer Function %5
+%12 = OpConstantNull %5
+%16 = OpTypeInt 32 1
+%15 = OpTypeVector %16 2
+%14 = OpTypeStruct %5 %15
+%3 = OpFunction %2 None %1
+%4 = OpLabel
+%10 = OpVariable %11 Function %12
+OpStore %10 %9
+%18 = OpLoad %5 %10
+%13 = OpExtInst %14 %17 FrexpStruct %18
+OpReturn
+OpFunctionEnd
+)";
+    EXPECT_EQ(expect, got);
+
+    Validate(b);
+}
+
 }  // namespace float_builtin_tests
 
 // Tests for Numeric builtins with all integer parameter
diff --git a/test/tint/bug/chromium/1236161.wgsl.expected.dxc.hlsl b/test/tint/bug/chromium/1236161.wgsl.expected.dxc.hlsl
index a0d44d90a7..136105307d 100644
--- a/test/tint/bug/chromium/1236161.wgsl.expected.dxc.hlsl
+++ b/test/tint/bug/chromium/1236161.wgsl.expected.dxc.hlsl
@@ -3,9 +3,8 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
diff --git a/test/tint/bug/chromium/1236161.wgsl.expected.fxc.hlsl b/test/tint/bug/chromium/1236161.wgsl.expected.fxc.hlsl
index a0d44d90a7..136105307d 100644
--- a/test/tint/bug/chromium/1236161.wgsl.expected.fxc.hlsl
+++ b/test/tint/bug/chromium/1236161.wgsl.expected.fxc.hlsl
@@ -3,9 +3,8 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
diff --git a/test/tint/bug/chromium/1236161.wgsl.expected.msl b/test/tint/bug/chromium/1236161.wgsl.expected.msl
index 4eb36e602b..8d7aa31d32 100644
--- a/test/tint/bug/chromium/1236161.wgsl.expected.msl
+++ b/test/tint/bug/chromium/1236161.wgsl.expected.msl
@@ -7,9 +7,9 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
 void i() {
diff --git a/test/tint/builtins/frexp.wgsl.expected.msl b/test/tint/builtins/frexp.wgsl.expected.msl
index d850760b4c..c9b0a6732e 100644
--- a/test/tint/builtins/frexp.wgsl.expected.msl
+++ b/test/tint/builtins/frexp.wgsl.expected.msl
@@ -7,9 +7,9 @@ struct frexp_result {
   int exp;
 };
 frexp_result tint_frexp(float param_0) {
-  int exp;
-  float sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
 kernel void tint_symbol() {
diff --git a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl
similarity index 87%
rename from test/tint/builtins/gen/literal/frexp/eabd40.wgsl
rename to test/tint/builtins/gen/literal/frexp/4b2200.wgsl
index 4a5552fa0c..271abc51e4 100644
--- a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(f32) -> __frexp_result
-fn frexp_eabd40() {
+// fn frexp(f32) -> __frexp_result<f32>
+fn frexp_4b2200() {
   var res = frexp(1.f);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_eabd40();
+  frexp_4b2200();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
diff --git a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.dxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.dxc.hlsl
index 2519b252cc..15ae2ad0ba 100644
--- a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result tint_frexp(float param_0) {
   return result;
 }
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   frexp_result res = tint_frexp(1.0f);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_eabd40();
+  frexp_4b2200();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.fxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.fxc.hlsl
index 2519b252cc..15ae2ad0ba 100644
--- a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result tint_frexp(float param_0) {
   return result;
 }
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   frexp_result res = tint_frexp(1.0f);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_eabd40();
+  frexp_4b2200();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.glsl
similarity index 90%
rename from test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.glsl
index 8fb90cde39..b9a00adb36 100644
--- a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.glsl
@@ -12,12 +12,12 @@ frexp_result tint_frexp(float param_0) {
 }
 
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   frexp_result res = tint_frexp(1.0f);
 }
 
 vec4 vertex_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ frexp_result tint_frexp(float param_0) {
 }
 
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   frexp_result res = tint_frexp(1.0f);
 }
 
 void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 void main() {
@@ -70,12 +70,12 @@ frexp_result tint_frexp(float param_0) {
 }
 
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   frexp_result res = tint_frexp(1.0f);
 }
 
 void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.msl
index 2dee3e7758..175e4510d0 100644
--- a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result {
   int exp;
 };
 frexp_result tint_frexp(float param_0) {
-  int exp;
-  float sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   frexp_result res = tint_frexp(1.0f);
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_eabd40();
+  frexp_4b2200();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
 kernel void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.spvasm
index ef220f57c3..f6d258caec 100644
--- a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_eabd40 "frexp_eabd40"
+               OpName %frexp_4b2200 "frexp_4b2200"
                OpName %__frexp_result "__frexp_result"
                OpMemberName %__frexp_result 0 "sig"
                OpMemberName %__frexp_result 1 "exp"
@@ -42,7 +42,7 @@
 %_ptr_Function___frexp_result = OpTypePointer Function %__frexp_result
          %20 = OpConstantNull %__frexp_result
          %21 = OpTypeFunction %v4float
-%frexp_eabd40 = OpFunction %void None %9
+%frexp_4b2200 = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___frexp_result Function %20
          %13 = OpExtInst %__frexp_result %16 FrexpStruct %float_1
@@ -51,7 +51,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %21
          %23 = OpLabel
-         %24 = OpFunctionCall %void %frexp_eabd40
+         %24 = OpFunctionCall %void %frexp_4b2200
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -63,11 +63,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %29 = OpLabel
-         %30 = OpFunctionCall %void %frexp_eabd40
+         %30 = OpFunctionCall %void %frexp_4b2200
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %32 = OpLabel
-         %33 = OpFunctionCall %void %frexp_eabd40
+         %33 = OpFunctionCall %void %frexp_4b2200
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.wgsl
similarity index 72%
rename from test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.wgsl
index 4bd91b68f3..92b00df694 100644
--- a/test/tint/builtins/gen/literal/frexp/eabd40.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/4b2200.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn frexp_eabd40() {
+fn frexp_4b2200() {
   var res = frexp(1.0f);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_eabd40();
+  frexp_4b2200();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
diff --git a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl b/test/tint/builtins/gen/literal/frexp/77af93.wgsl
similarity index 86%
rename from test/tint/builtins/gen/literal/frexp/3c4f48.wgsl
rename to test/tint/builtins/gen/literal/frexp/77af93.wgsl
index 0ee9560de0..489f812645 100644
--- a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(vec<4, f32>) -> __frexp_result_vec<4>
-fn frexp_3c4f48() {
+// fn frexp(vec<4, f32>) -> __frexp_result_vec<4, f32>
+fn frexp_77af93() {
   var res = frexp(vec4<f32>(1.f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_3c4f48();
+  frexp_77af93();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
diff --git a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.dxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.dxc.hlsl
index 5fc892b4a2..7ef05cb6ac 100644
--- a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec4 tint_frexp(float4 param_0) {
   return result;
 }
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   frexp_result_vec4 res = tint_frexp((1.0f).xxxx);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_3c4f48();
+  frexp_77af93();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.fxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.fxc.hlsl
index 5fc892b4a2..7ef05cb6ac 100644
--- a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec4 tint_frexp(float4 param_0) {
   return result;
 }
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   frexp_result_vec4 res = tint_frexp((1.0f).xxxx);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_3c4f48();
+  frexp_77af93();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.glsl
index 83e64f2eb5..052733493f 100644
--- a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.glsl
@@ -12,12 +12,12 @@ frexp_result_vec4 tint_frexp(vec4 param_0) {
 }
 
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   frexp_result_vec4 res = tint_frexp(vec4(1.0f));
 }
 
 vec4 vertex_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ frexp_result_vec4 tint_frexp(vec4 param_0) {
 }
 
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   frexp_result_vec4 res = tint_frexp(vec4(1.0f));
 }
 
 void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 void main() {
@@ -70,12 +70,12 @@ frexp_result_vec4 tint_frexp(vec4 param_0) {
 }
 
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   frexp_result_vec4 res = tint_frexp(vec4(1.0f));
 }
 
 void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.msl
index c150a8c264..2b6c155b63 100644
--- a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result_vec4 {
   int4 exp;
 };
 frexp_result_vec4 tint_frexp(float4 param_0) {
-  int4 exp;
-  float4 sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result_vec4 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   frexp_result_vec4 res = tint_frexp(float4(1.0f));
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_3c4f48();
+  frexp_77af93();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
 kernel void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.spvasm
index 953f054dfb..fb7597887c 100644
--- a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_3c4f48 "frexp_3c4f48"
+               OpName %frexp_77af93 "frexp_77af93"
                OpName %__frexp_result_vec4 "__frexp_result_vec4"
                OpMemberName %__frexp_result_vec4 0 "sig"
                OpMemberName %__frexp_result_vec4 1 "exp"
@@ -44,7 +44,7 @@
 %_ptr_Function___frexp_result_vec4 = OpTypePointer Function %__frexp_result_vec4
          %22 = OpConstantNull %__frexp_result_vec4
          %23 = OpTypeFunction %v4float
-%frexp_3c4f48 = OpFunction %void None %9
+%frexp_77af93 = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___frexp_result_vec4 Function %22
          %13 = OpExtInst %__frexp_result_vec4 %17 FrexpStruct %19
@@ -53,7 +53,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %23
          %25 = OpLabel
-         %26 = OpFunctionCall %void %frexp_3c4f48
+         %26 = OpFunctionCall %void %frexp_77af93
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -65,11 +65,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %31 = OpLabel
-         %32 = OpFunctionCall %void %frexp_3c4f48
+         %32 = OpFunctionCall %void %frexp_77af93
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %34 = OpLabel
-         %35 = OpFunctionCall %void %frexp_3c4f48
+         %35 = OpFunctionCall %void %frexp_77af93
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.wgsl
similarity index 73%
rename from test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.wgsl
index cb1d316639..3e057ceccf 100644
--- a/test/tint/builtins/gen/literal/frexp/3c4f48.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/77af93.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn frexp_3c4f48() {
+fn frexp_77af93() {
   var res = frexp(vec4<f32>(1.0f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_3c4f48();
+  frexp_77af93();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
diff --git a/test/tint/builtins/gen/literal/frexp/368997.wgsl b/test/tint/builtins/gen/literal/frexp/979800.wgsl
similarity index 86%
rename from test/tint/builtins/gen/literal/frexp/368997.wgsl
rename to test/tint/builtins/gen/literal/frexp/979800.wgsl
index 25c6007b59..24f121781b 100644
--- a/test/tint/builtins/gen/literal/frexp/368997.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(vec<3, f32>) -> __frexp_result_vec<3>
-fn frexp_368997() {
+// fn frexp(vec<3, f32>) -> __frexp_result_vec<3, f32>
+fn frexp_979800() {
   var res = frexp(vec3<f32>(1.f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_368997();
+  frexp_979800();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_368997();
+  frexp_979800();
 }
diff --git a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.dxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.dxc.hlsl
index d546bd6ce6..1152ca2026 100644
--- a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec3 tint_frexp(float3 param_0) {
   return result;
 }
 
-void frexp_368997() {
+void frexp_979800() {
   frexp_result_vec3 res = tint_frexp((1.0f).xxx);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_368997();
+  frexp_979800();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.fxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.fxc.hlsl
index d546bd6ce6..1152ca2026 100644
--- a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec3 tint_frexp(float3 param_0) {
   return result;
 }
 
-void frexp_368997() {
+void frexp_979800() {
   frexp_result_vec3 res = tint_frexp((1.0f).xxx);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_368997();
+  frexp_979800();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.glsl
index 0ebe90fca6..b102854cc0 100644
--- a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.glsl
@@ -12,12 +12,12 @@ frexp_result_vec3 tint_frexp(vec3 param_0) {
 }
 
 
-void frexp_368997() {
+void frexp_979800() {
   frexp_result_vec3 res = tint_frexp(vec3(1.0f));
 }
 
 vec4 vertex_main() {
-  frexp_368997();
+  frexp_979800();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ frexp_result_vec3 tint_frexp(vec3 param_0) {
 }
 
 
-void frexp_368997() {
+void frexp_979800() {
   frexp_result_vec3 res = tint_frexp(vec3(1.0f));
 }
 
 void fragment_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 void main() {
@@ -70,12 +70,12 @@ frexp_result_vec3 tint_frexp(vec3 param_0) {
 }
 
 
-void frexp_368997() {
+void frexp_979800() {
   frexp_result_vec3 res = tint_frexp(vec3(1.0f));
 }
 
 void compute_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.msl
index d00280f92c..ee55ebfe6c 100644
--- a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result_vec3 {
   int3 exp;
 };
 frexp_result_vec3 tint_frexp(float3 param_0) {
-  int3 exp;
-  float3 sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result_vec3 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_368997() {
+void frexp_979800() {
   frexp_result_vec3 res = tint_frexp(float3(1.0f));
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_368997();
+  frexp_979800();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
 kernel void compute_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.spvasm
index df6c282447..299cabc232 100644
--- a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_368997 "frexp_368997"
+               OpName %frexp_979800 "frexp_979800"
                OpName %__frexp_result_vec3 "__frexp_result_vec3"
                OpMemberName %__frexp_result_vec3 0 "sig"
                OpMemberName %__frexp_result_vec3 1 "exp"
@@ -45,7 +45,7 @@
 %_ptr_Function___frexp_result_vec3 = OpTypePointer Function %__frexp_result_vec3
          %23 = OpConstantNull %__frexp_result_vec3
          %24 = OpTypeFunction %v4float
-%frexp_368997 = OpFunction %void None %9
+%frexp_979800 = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___frexp_result_vec3 Function %23
          %13 = OpExtInst %__frexp_result_vec3 %18 FrexpStruct %20
@@ -54,7 +54,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %24
          %26 = OpLabel
-         %27 = OpFunctionCall %void %frexp_368997
+         %27 = OpFunctionCall %void %frexp_979800
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -66,11 +66,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %32 = OpLabel
-         %33 = OpFunctionCall %void %frexp_368997
+         %33 = OpFunctionCall %void %frexp_979800
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %35 = OpLabel
-         %36 = OpFunctionCall %void %frexp_368997
+         %36 = OpFunctionCall %void %frexp_979800
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.wgsl
similarity index 73%
rename from test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.wgsl
index 2f9ec781f0..d3dd2f817a 100644
--- a/test/tint/builtins/gen/literal/frexp/368997.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/979800.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn frexp_368997() {
+fn frexp_979800() {
   var res = frexp(vec3<f32>(1.0f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_368997();
+  frexp_979800();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_368997();
+  frexp_979800();
 }
diff --git a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl
similarity index 86%
rename from test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl
rename to test/tint/builtins/gen/literal/frexp/eb2421.wgsl
index 1a956d2698..2f5b30b338 100644
--- a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(vec<2, f32>) -> __frexp_result_vec<2>
-fn frexp_4bdfc7() {
+// fn frexp(vec<2, f32>) -> __frexp_result_vec<2, f32>
+fn frexp_eb2421() {
   var res = frexp(vec2<f32>(1.f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
diff --git a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.dxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.dxc.hlsl
index 310178b70f..b45f18e198 100644
--- a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec2 tint_frexp(float2 param_0) {
   return result;
 }
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   frexp_result_vec2 res = tint_frexp((1.0f).xx);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.fxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.fxc.hlsl
index 310178b70f..b45f18e198 100644
--- a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec2 tint_frexp(float2 param_0) {
   return result;
 }
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   frexp_result_vec2 res = tint_frexp((1.0f).xx);
 }
 
@@ -18,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.glsl
index b6b21f4834..0528f5e193 100644
--- a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.glsl
@@ -12,12 +12,12 @@ frexp_result_vec2 tint_frexp(vec2 param_0) {
 }
 
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   frexp_result_vec2 res = tint_frexp(vec2(1.0f));
 }
 
 vec4 vertex_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ frexp_result_vec2 tint_frexp(vec2 param_0) {
 }
 
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   frexp_result_vec2 res = tint_frexp(vec2(1.0f));
 }
 
 void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 void main() {
@@ -70,12 +70,12 @@ frexp_result_vec2 tint_frexp(vec2 param_0) {
 }
 
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   frexp_result_vec2 res = tint_frexp(vec2(1.0f));
 }
 
 void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.msl b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.msl
index dc8fd476a9..8a7cb11689 100644
--- a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result_vec2 {
   int2 exp;
 };
 frexp_result_vec2 tint_frexp(float2 param_0) {
-  int2 exp;
-  float2 sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result_vec2 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   frexp_result_vec2 res = tint_frexp(float2(1.0f));
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
 kernel void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.spvasm
index 5c21dff1aa..b4eb572d45 100644
--- a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_4bdfc7 "frexp_4bdfc7"
+               OpName %frexp_eb2421 "frexp_eb2421"
                OpName %__frexp_result_vec2 "__frexp_result_vec2"
                OpMemberName %__frexp_result_vec2 0 "sig"
                OpMemberName %__frexp_result_vec2 1 "exp"
@@ -45,7 +45,7 @@
 %_ptr_Function___frexp_result_vec2 = OpTypePointer Function %__frexp_result_vec2
          %23 = OpConstantNull %__frexp_result_vec2
          %24 = OpTypeFunction %v4float
-%frexp_4bdfc7 = OpFunction %void None %9
+%frexp_eb2421 = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___frexp_result_vec2 Function %23
          %13 = OpExtInst %__frexp_result_vec2 %18 FrexpStruct %20
@@ -54,7 +54,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %24
          %26 = OpLabel
-         %27 = OpFunctionCall %void %frexp_4bdfc7
+         %27 = OpFunctionCall %void %frexp_eb2421
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -66,11 +66,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %32 = OpLabel
-         %33 = OpFunctionCall %void %frexp_4bdfc7
+         %33 = OpFunctionCall %void %frexp_eb2421
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %35 = OpLabel
-         %36 = OpFunctionCall %void %frexp_4bdfc7
+         %36 = OpFunctionCall %void %frexp_eb2421
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.wgsl
similarity index 73%
rename from test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.wgsl
index 23a0e009f0..a4877a129c 100644
--- a/test/tint/builtins/gen/literal/frexp/4bdfc7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/frexp/eb2421.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn frexp_4bdfc7() {
+fn frexp_eb2421() {
   var res = frexp(vec2<f32>(1.0f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
diff --git a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl b/test/tint/builtins/gen/literal/modf/2d50da.wgsl
similarity index 87%
rename from test/tint/builtins/gen/literal/modf/f5f20d.wgsl
rename to test/tint/builtins/gen/literal/modf/2d50da.wgsl
index bd7b7378f0..8d3d0ddfd7 100644
--- a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(vec<2, f32>) -> __modf_result_vec<2>
-fn modf_f5f20d() {
+// fn modf(vec<2, f32>) -> __modf_result_vec<2, f32>
+fn modf_2d50da() {
   var res = modf(vec2<f32>(1.f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_f5f20d();
+  modf_2d50da();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
diff --git a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.dxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.dxc.hlsl
index 6b7bdea96d..2aba1e7707 100644
--- a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec2 {
   float2 whole;
 };
 modf_result_vec2 tint_modf(float2 param_0) {
-  float2 whole;
-  float2 fract = modf(param_0, whole);
-  modf_result_vec2 result = {fract, whole};
+  modf_result_vec2 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_f5f20d() {
+void modf_2d50da() {
   modf_result_vec2 res = tint_modf((1.0f).xx);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_f5f20d();
+  modf_2d50da();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.fxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.fxc.hlsl
index 6b7bdea96d..2aba1e7707 100644
--- a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec2 {
   float2 whole;
 };
 modf_result_vec2 tint_modf(float2 param_0) {
-  float2 whole;
-  float2 fract = modf(param_0, whole);
-  modf_result_vec2 result = {fract, whole};
+  modf_result_vec2 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_f5f20d() {
+void modf_2d50da() {
   modf_result_vec2 res = tint_modf((1.0f).xx);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_f5f20d();
+  modf_2d50da();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.glsl
index aa9477cd09..540a580081 100644
--- a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.glsl
@@ -12,12 +12,12 @@ modf_result_vec2 tint_modf(vec2 param_0) {
 }
 
 
-void modf_f5f20d() {
+void modf_2d50da() {
   modf_result_vec2 res = tint_modf(vec2(1.0f));
 }
 
 vec4 vertex_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ modf_result_vec2 tint_modf(vec2 param_0) {
 }
 
 
-void modf_f5f20d() {
+void modf_2d50da() {
   modf_result_vec2 res = tint_modf(vec2(1.0f));
 }
 
 void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 void main() {
@@ -70,12 +70,12 @@ modf_result_vec2 tint_modf(vec2 param_0) {
 }
 
 
-void modf_f5f20d() {
+void modf_2d50da() {
   modf_result_vec2 res = tint_modf(vec2(1.0f));
 }
 
 void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.msl
index e2b7204395..edccc81725 100644
--- a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result_vec2 {
   float2 whole;
 };
 modf_result_vec2 tint_modf(float2 param_0) {
-  float2 whole;
-  float2 fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result_vec2 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_f5f20d() {
+void modf_2d50da() {
   modf_result_vec2 res = tint_modf(float2(1.0f));
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_f5f20d();
+  modf_2d50da();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
 kernel void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.spvasm
index dd059cb98e..bc7576901c 100644
--- a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_f5f20d "modf_f5f20d"
+               OpName %modf_2d50da "modf_2d50da"
                OpName %__modf_result_vec2 "__modf_result_vec2"
                OpMemberName %__modf_result_vec2 0 "fract"
                OpMemberName %__modf_result_vec2 1 "whole"
@@ -43,7 +43,7 @@
 %_ptr_Function___modf_result_vec2 = OpTypePointer Function %__modf_result_vec2
          %21 = OpConstantNull %__modf_result_vec2
          %22 = OpTypeFunction %v4float
-%modf_f5f20d = OpFunction %void None %9
+%modf_2d50da = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___modf_result_vec2 Function %21
          %13 = OpExtInst %__modf_result_vec2 %16 ModfStruct %18
@@ -52,7 +52,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %22
          %24 = OpLabel
-         %25 = OpFunctionCall %void %modf_f5f20d
+         %25 = OpFunctionCall %void %modf_2d50da
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -64,11 +64,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %30 = OpLabel
-         %31 = OpFunctionCall %void %modf_f5f20d
+         %31 = OpFunctionCall %void %modf_2d50da
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %33 = OpLabel
-         %34 = OpFunctionCall %void %modf_f5f20d
+         %34 = OpFunctionCall %void %modf_2d50da
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.wgsl
similarity index 74%
rename from test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.wgsl
index c34c0df5b6..d893b25e80 100644
--- a/test/tint/builtins/gen/literal/modf/f5f20d.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/modf/2d50da.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn modf_f5f20d() {
+fn modf_2d50da() {
   var res = modf(vec2<f32>(1.0f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_f5f20d();
+  modf_2d50da();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
diff --git a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl b/test/tint/builtins/gen/literal/modf/4bfced.wgsl
similarity index 87%
rename from test/tint/builtins/gen/literal/modf/ec2dbc.wgsl
rename to test/tint/builtins/gen/literal/modf/4bfced.wgsl
index 00964734a8..1a3fd9a1b2 100644
--- a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(vec<4, f32>) -> __modf_result_vec<4>
-fn modf_ec2dbc() {
+// fn modf(vec<4, f32>) -> __modf_result_vec<4, f32>
+fn modf_4bfced() {
   var res = modf(vec4<f32>(1.f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_ec2dbc();
+  modf_4bfced();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
diff --git a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.dxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.dxc.hlsl
index 1610de1c1d..043bbab60d 100644
--- a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec4 {
   float4 whole;
 };
 modf_result_vec4 tint_modf(float4 param_0) {
-  float4 whole;
-  float4 fract = modf(param_0, whole);
-  modf_result_vec4 result = {fract, whole};
+  modf_result_vec4 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   modf_result_vec4 res = tint_modf((1.0f).xxxx);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_ec2dbc();
+  modf_4bfced();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.fxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.fxc.hlsl
index 1610de1c1d..043bbab60d 100644
--- a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec4 {
   float4 whole;
 };
 modf_result_vec4 tint_modf(float4 param_0) {
-  float4 whole;
-  float4 fract = modf(param_0, whole);
-  modf_result_vec4 result = {fract, whole};
+  modf_result_vec4 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   modf_result_vec4 res = tint_modf((1.0f).xxxx);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_ec2dbc();
+  modf_4bfced();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.glsl
index 7792ce9a80..7c7e682147 100644
--- a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.glsl
@@ -12,12 +12,12 @@ modf_result_vec4 tint_modf(vec4 param_0) {
 }
 
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   modf_result_vec4 res = tint_modf(vec4(1.0f));
 }
 
 vec4 vertex_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ modf_result_vec4 tint_modf(vec4 param_0) {
 }
 
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   modf_result_vec4 res = tint_modf(vec4(1.0f));
 }
 
 void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 void main() {
@@ -70,12 +70,12 @@ modf_result_vec4 tint_modf(vec4 param_0) {
 }
 
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   modf_result_vec4 res = tint_modf(vec4(1.0f));
 }
 
 void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.msl
index ea4b8568c6..3b5da9c052 100644
--- a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result_vec4 {
   float4 whole;
 };
 modf_result_vec4 tint_modf(float4 param_0) {
-  float4 whole;
-  float4 fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result_vec4 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   modf_result_vec4 res = tint_modf(float4(1.0f));
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_ec2dbc();
+  modf_4bfced();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
 kernel void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.spvasm
index 61b2faa1db..2a58dd4174 100644
--- a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_ec2dbc "modf_ec2dbc"
+               OpName %modf_4bfced "modf_4bfced"
                OpName %__modf_result_vec4 "__modf_result_vec4"
                OpMemberName %__modf_result_vec4 0 "fract"
                OpMemberName %__modf_result_vec4 1 "whole"
@@ -42,7 +42,7 @@
 %_ptr_Function___modf_result_vec4 = OpTypePointer Function %__modf_result_vec4
          %20 = OpConstantNull %__modf_result_vec4
          %21 = OpTypeFunction %v4float
-%modf_ec2dbc = OpFunction %void None %9
+%modf_4bfced = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___modf_result_vec4 Function %20
          %13 = OpExtInst %__modf_result_vec4 %15 ModfStruct %17
@@ -51,7 +51,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %21
          %23 = OpLabel
-         %24 = OpFunctionCall %void %modf_ec2dbc
+         %24 = OpFunctionCall %void %modf_4bfced
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -63,11 +63,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %29 = OpLabel
-         %30 = OpFunctionCall %void %modf_ec2dbc
+         %30 = OpFunctionCall %void %modf_4bfced
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %32 = OpLabel
-         %33 = OpFunctionCall %void %modf_ec2dbc
+         %33 = OpFunctionCall %void %modf_4bfced
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.wgsl
similarity index 74%
rename from test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.wgsl
index b06d9d7deb..0b04b87797 100644
--- a/test/tint/builtins/gen/literal/modf/ec2dbc.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/modf/4bfced.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn modf_ec2dbc() {
+fn modf_4bfced() {
   var res = modf(vec4<f32>(1.0f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_ec2dbc();
+  modf_4bfced();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
diff --git a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl b/test/tint/builtins/gen/literal/modf/5ea256.wgsl
similarity index 87%
rename from test/tint/builtins/gen/literal/modf/9b75f7.wgsl
rename to test/tint/builtins/gen/literal/modf/5ea256.wgsl
index e15a541436..673bb2517e 100644
--- a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(vec<3, f32>) -> __modf_result_vec<3>
-fn modf_9b75f7() {
+// fn modf(vec<3, f32>) -> __modf_result_vec<3, f32>
+fn modf_5ea256() {
   var res = modf(vec3<f32>(1.f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_9b75f7();
+  modf_5ea256();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
diff --git a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.dxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.dxc.hlsl
index b2fabab03a..a2c46f5a60 100644
--- a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec3 {
   float3 whole;
 };
 modf_result_vec3 tint_modf(float3 param_0) {
-  float3 whole;
-  float3 fract = modf(param_0, whole);
-  modf_result_vec3 result = {fract, whole};
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_9b75f7() {
+void modf_5ea256() {
   modf_result_vec3 res = tint_modf((1.0f).xxx);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_9b75f7();
+  modf_5ea256();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.fxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.fxc.hlsl
index b2fabab03a..a2c46f5a60 100644
--- a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec3 {
   float3 whole;
 };
 modf_result_vec3 tint_modf(float3 param_0) {
-  float3 whole;
-  float3 fract = modf(param_0, whole);
-  modf_result_vec3 result = {fract, whole};
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_9b75f7() {
+void modf_5ea256() {
   modf_result_vec3 res = tint_modf((1.0f).xxx);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_9b75f7();
+  modf_5ea256();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.glsl
index 96710379a6..7a727ecf19 100644
--- a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.glsl
@@ -12,12 +12,12 @@ modf_result_vec3 tint_modf(vec3 param_0) {
 }
 
 
-void modf_9b75f7() {
+void modf_5ea256() {
   modf_result_vec3 res = tint_modf(vec3(1.0f));
 }
 
 vec4 vertex_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ modf_result_vec3 tint_modf(vec3 param_0) {
 }
 
 
-void modf_9b75f7() {
+void modf_5ea256() {
   modf_result_vec3 res = tint_modf(vec3(1.0f));
 }
 
 void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 void main() {
@@ -70,12 +70,12 @@ modf_result_vec3 tint_modf(vec3 param_0) {
 }
 
 
-void modf_9b75f7() {
+void modf_5ea256() {
   modf_result_vec3 res = tint_modf(vec3(1.0f));
 }
 
 void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.msl
index 652a8b6fde..33e7fa36e6 100644
--- a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result_vec3 {
   float3 whole;
 };
 modf_result_vec3 tint_modf(float3 param_0) {
-  float3 whole;
-  float3 fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_9b75f7() {
+void modf_5ea256() {
   modf_result_vec3 res = tint_modf(float3(1.0f));
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_9b75f7();
+  modf_5ea256();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
 kernel void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.spvasm
index bac50d9d76..6762d611b1 100644
--- a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_9b75f7 "modf_9b75f7"
+               OpName %modf_5ea256 "modf_5ea256"
                OpName %__modf_result_vec3 "__modf_result_vec3"
                OpMemberName %__modf_result_vec3 0 "fract"
                OpMemberName %__modf_result_vec3 1 "whole"
@@ -43,7 +43,7 @@
 %_ptr_Function___modf_result_vec3 = OpTypePointer Function %__modf_result_vec3
          %21 = OpConstantNull %__modf_result_vec3
          %22 = OpTypeFunction %v4float
-%modf_9b75f7 = OpFunction %void None %9
+%modf_5ea256 = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___modf_result_vec3 Function %21
          %13 = OpExtInst %__modf_result_vec3 %16 ModfStruct %18
@@ -52,7 +52,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %22
          %24 = OpLabel
-         %25 = OpFunctionCall %void %modf_9b75f7
+         %25 = OpFunctionCall %void %modf_5ea256
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -64,11 +64,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %30 = OpLabel
-         %31 = OpFunctionCall %void %modf_9b75f7
+         %31 = OpFunctionCall %void %modf_5ea256
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %33 = OpLabel
-         %34 = OpFunctionCall %void %modf_9b75f7
+         %34 = OpFunctionCall %void %modf_5ea256
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.wgsl
similarity index 74%
rename from test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.wgsl
index 6fc1a82caf..ea4142d8c6 100644
--- a/test/tint/builtins/gen/literal/modf/9b75f7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/modf/5ea256.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn modf_9b75f7() {
+fn modf_5ea256() {
   var res = modf(vec3<f32>(1.0f));
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_9b75f7();
+  modf_5ea256();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
diff --git a/test/tint/builtins/gen/literal/modf/180fed.wgsl b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl
similarity index 88%
rename from test/tint/builtins/gen/literal/modf/180fed.wgsl
rename to test/tint/builtins/gen/literal/modf/bbf7f7.wgsl
index 4ac7658523..d0ffdaa96d 100644
--- a/test/tint/builtins/gen/literal/modf/180fed.wgsl
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(f32) -> __modf_result
-fn modf_180fed() {
+// fn modf(f32) -> __modf_result<f32>
+fn modf_bbf7f7() {
   var res = modf(1.f);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_180fed();
+  modf_bbf7f7();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
diff --git a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.dxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.dxc.hlsl
index 0f7a58d42c..020478a8f8 100644
--- a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_180fed() {
+void modf_bbf7f7() {
   modf_result res = tint_modf(1.0f);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_180fed();
+  modf_bbf7f7();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.fxc.hlsl
similarity index 76%
rename from test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.fxc.hlsl
index 0f7a58d42c..020478a8f8 100644
--- a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_180fed() {
+void modf_bbf7f7() {
   modf_result res = tint_modf(1.0f);
 }
 
@@ -18,7 +17,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_180fed();
+  modf_bbf7f7();
   return (0.0f).xxxx;
 }
 
@@ -30,12 +29,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
diff --git a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.glsl
rename to test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.glsl
index 2e96b3c308..30917acac3 100644
--- a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.glsl
@@ -12,12 +12,12 @@ modf_result tint_modf(float param_0) {
 }
 
 
-void modf_180fed() {
+void modf_bbf7f7() {
   modf_result res = tint_modf(1.0f);
 }
 
 vec4 vertex_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return vec4(0.0f);
 }
 
@@ -44,12 +44,12 @@ modf_result tint_modf(float param_0) {
 }
 
 
-void modf_180fed() {
+void modf_bbf7f7() {
   modf_result res = tint_modf(1.0f);
 }
 
 void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 void main() {
@@ -70,12 +70,12 @@ modf_result tint_modf(float param_0) {
 }
 
 
-void modf_180fed() {
+void modf_bbf7f7() {
   modf_result res = tint_modf(1.0f);
 }
 
 void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.msl b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.msl
rename to test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.msl
index b7ba9eb670..250e830d22 100644
--- a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.msl
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_180fed() {
+void modf_bbf7f7() {
   modf_result res = tint_modf(1.0f);
 }
 
@@ -21,7 +21,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_180fed();
+  modf_bbf7f7();
   return float4(0.0f);
 }
 
@@ -33,12 +33,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
 kernel void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
diff --git a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.spvasm b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.spvasm
rename to test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.spvasm
index b90be4c58f..21a235880f 100644
--- a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_180fed "modf_180fed"
+               OpName %modf_bbf7f7 "modf_bbf7f7"
                OpName %__modf_result "__modf_result"
                OpMemberName %__modf_result 0 "fract"
                OpMemberName %__modf_result 1 "whole"
@@ -41,7 +41,7 @@
 %_ptr_Function___modf_result = OpTypePointer Function %__modf_result
          %19 = OpConstantNull %__modf_result
          %20 = OpTypeFunction %v4float
-%modf_180fed = OpFunction %void None %9
+%modf_bbf7f7 = OpFunction %void None %9
          %12 = OpLabel
         %res = OpVariable %_ptr_Function___modf_result Function %19
          %13 = OpExtInst %__modf_result %15 ModfStruct %float_1
@@ -50,7 +50,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %20
          %22 = OpLabel
-         %23 = OpFunctionCall %void %modf_180fed
+         %23 = OpFunctionCall %void %modf_bbf7f7
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -62,11 +62,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %28 = OpLabel
-         %29 = OpFunctionCall %void %modf_180fed
+         %29 = OpFunctionCall %void %modf_bbf7f7
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %31 = OpLabel
-         %32 = OpFunctionCall %void %modf_180fed
+         %32 = OpFunctionCall %void %modf_bbf7f7
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.wgsl b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.wgsl
similarity index 73%
rename from test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.wgsl
rename to test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.wgsl
index c1fb535ffe..31c86d6146 100644
--- a/test/tint/builtins/gen/literal/modf/180fed.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/literal/modf/bbf7f7.wgsl.expected.wgsl
@@ -1,19 +1,19 @@
-fn modf_180fed() {
+fn modf_bbf7f7() {
   var res = modf(1.0f);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_180fed();
+  modf_bbf7f7();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
diff --git a/test/tint/builtins/gen/var/frexp/eabd40.wgsl b/test/tint/builtins/gen/var/frexp/4b2200.wgsl
similarity index 87%
rename from test/tint/builtins/gen/var/frexp/eabd40.wgsl
rename to test/tint/builtins/gen/var/frexp/4b2200.wgsl
index c378b99c8c..2802b5f050 100644
--- a/test/tint/builtins/gen/var/frexp/eabd40.wgsl
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(f32) -> __frexp_result
-fn frexp_eabd40() {
+// fn frexp(f32) -> __frexp_result<f32>
+fn frexp_4b2200() {
   var arg_0 = 1.f;
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_eabd40();
+  frexp_4b2200();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
diff --git a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.dxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.dxc.hlsl
index a3e419530b..8dcfcd2914 100644
--- a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result tint_frexp(float param_0) {
   return result;
 }
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_eabd40();
+  frexp_4b2200();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.fxc.hlsl
similarity index 89%
rename from test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.fxc.hlsl
index a3e419530b..8dcfcd2914 100644
--- a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result tint_frexp(float param_0) {
   return result;
 }
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_eabd40();
+  frexp_4b2200();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.glsl
index 6d1a1b18e3..bcf42ce205 100644
--- a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.glsl
@@ -12,13 +12,13 @@ frexp_result tint_frexp(float param_0) {
 }
 
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result res = tint_frexp(arg_0);
 }
 
 vec4 vertex_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ frexp_result tint_frexp(float param_0) {
 }
 
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result res = tint_frexp(arg_0);
 }
 
 void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 void main() {
@@ -72,13 +72,13 @@ frexp_result tint_frexp(float param_0) {
 }
 
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result res = tint_frexp(arg_0);
 }
 
 void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.msl b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.msl
similarity index 78%
rename from test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.msl
rename to test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.msl
index 3249522c40..3c34d9cf3b 100644
--- a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result {
   int exp;
 };
 frexp_result tint_frexp(float param_0) {
-  int exp;
-  float sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_eabd40() {
+void frexp_4b2200() {
   float arg_0 = 1.0f;
   frexp_result res = tint_frexp(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_eabd40();
+  frexp_4b2200();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
 kernel void compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.spvasm
index 4b0fed2381..b871068844 100644
--- a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_eabd40 "frexp_eabd40"
+               OpName %frexp_4b2200 "frexp_4b2200"
                OpName %arg_0 "arg_0"
                OpName %__frexp_result "__frexp_result"
                OpMemberName %__frexp_result 0 "sig"
@@ -44,7 +44,7 @@
 %_ptr_Function___frexp_result = OpTypePointer Function %__frexp_result
          %23 = OpConstantNull %__frexp_result
          %24 = OpTypeFunction %v4float
-%frexp_eabd40 = OpFunction %void None %9
+%frexp_4b2200 = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_float Function %8
         %res = OpVariable %_ptr_Function___frexp_result Function %23
@@ -56,7 +56,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %24
          %26 = OpLabel
-         %27 = OpFunctionCall %void %frexp_eabd40
+         %27 = OpFunctionCall %void %frexp_4b2200
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -68,11 +68,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %32 = OpLabel
-         %33 = OpFunctionCall %void %frexp_eabd40
+         %33 = OpFunctionCall %void %frexp_4b2200
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %35 = OpLabel
-         %36 = OpFunctionCall %void %frexp_eabd40
+         %36 = OpFunctionCall %void %frexp_4b2200
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.wgsl b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.wgsl
similarity index 74%
rename from test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.wgsl
index 1c79907809..c06eb399a9 100644
--- a/test/tint/builtins/gen/var/frexp/eabd40.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/frexp/4b2200.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn frexp_eabd40() {
+fn frexp_4b2200() {
   var arg_0 = 1.0f;
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_eabd40();
+  frexp_4b2200();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_eabd40();
+  frexp_4b2200();
 }
diff --git a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl b/test/tint/builtins/gen/var/frexp/77af93.wgsl
similarity index 86%
rename from test/tint/builtins/gen/var/frexp/3c4f48.wgsl
rename to test/tint/builtins/gen/var/frexp/77af93.wgsl
index bfbd3884ee..4aab6cda20 100644
--- a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(vec<4, f32>) -> __frexp_result_vec<4>
-fn frexp_3c4f48() {
+// fn frexp(vec<4, f32>) -> __frexp_result_vec<4, f32>
+fn frexp_77af93() {
   var arg_0 = vec4<f32>(1.f);
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_3c4f48();
+  frexp_77af93();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
diff --git a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.dxc.hlsl
similarity index 90%
rename from test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.dxc.hlsl
index 176553cd76..b828fd2595 100644
--- a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec4 tint_frexp(float4 param_0) {
   return result;
 }
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   float4 arg_0 = (1.0f).xxxx;
   frexp_result_vec4 res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_3c4f48();
+  frexp_77af93();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.fxc.hlsl
similarity index 90%
rename from test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.fxc.hlsl
index 176553cd76..b828fd2595 100644
--- a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec4 tint_frexp(float4 param_0) {
   return result;
 }
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   float4 arg_0 = (1.0f).xxxx;
   frexp_result_vec4 res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_3c4f48();
+  frexp_77af93();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.glsl
index eb9b7d19ed..cf01df2fe3 100644
--- a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.glsl
@@ -12,13 +12,13 @@ frexp_result_vec4 tint_frexp(vec4 param_0) {
 }
 
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   vec4 arg_0 = vec4(1.0f);
   frexp_result_vec4 res = tint_frexp(arg_0);
 }
 
 vec4 vertex_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ frexp_result_vec4 tint_frexp(vec4 param_0) {
 }
 
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   vec4 arg_0 = vec4(1.0f);
   frexp_result_vec4 res = tint_frexp(arg_0);
 }
 
 void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 void main() {
@@ -72,13 +72,13 @@ frexp_result_vec4 tint_frexp(vec4 param_0) {
 }
 
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   vec4 arg_0 = vec4(1.0f);
   frexp_result_vec4 res = tint_frexp(arg_0);
 }
 
 void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.msl b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.msl
similarity index 79%
rename from test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.msl
rename to test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.msl
index 0b0f6565e1..013a8f3410 100644
--- a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result_vec4 {
   int4 exp;
 };
 frexp_result_vec4 tint_frexp(float4 param_0) {
-  int4 exp;
-  float4 sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result_vec4 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_3c4f48() {
+void frexp_77af93() {
   float4 arg_0 = float4(1.0f);
   frexp_result_vec4 res = tint_frexp(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_3c4f48();
+  frexp_77af93();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
 kernel void compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.spvasm
similarity index 93%
rename from test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.spvasm
index e09db9d93a..42998a126f 100644
--- a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_3c4f48 "frexp_3c4f48"
+               OpName %frexp_77af93 "frexp_77af93"
                OpName %arg_0 "arg_0"
                OpName %__frexp_result_vec4 "__frexp_result_vec4"
                OpMemberName %__frexp_result_vec4 0 "sig"
@@ -46,7 +46,7 @@
 %_ptr_Function___frexp_result_vec4 = OpTypePointer Function %__frexp_result_vec4
          %25 = OpConstantNull %__frexp_result_vec4
          %26 = OpTypeFunction %v4float
-%frexp_3c4f48 = OpFunction %void None %9
+%frexp_77af93 = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_v4float Function %5
         %res = OpVariable %_ptr_Function___frexp_result_vec4 Function %25
@@ -58,7 +58,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %26
          %28 = OpLabel
-         %29 = OpFunctionCall %void %frexp_3c4f48
+         %29 = OpFunctionCall %void %frexp_77af93
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -70,11 +70,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %34 = OpLabel
-         %35 = OpFunctionCall %void %frexp_3c4f48
+         %35 = OpFunctionCall %void %frexp_77af93
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %37 = OpLabel
-         %38 = OpFunctionCall %void %frexp_3c4f48
+         %38 = OpFunctionCall %void %frexp_77af93
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.wgsl b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.wgsl
similarity index 75%
rename from test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.wgsl
index 37c167f3fb..b07da65e74 100644
--- a/test/tint/builtins/gen/var/frexp/3c4f48.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/frexp/77af93.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn frexp_3c4f48() {
+fn frexp_77af93() {
   var arg_0 = vec4<f32>(1.0f);
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_3c4f48();
+  frexp_77af93();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_3c4f48();
+  frexp_77af93();
 }
diff --git a/test/tint/builtins/gen/var/frexp/368997.wgsl b/test/tint/builtins/gen/var/frexp/979800.wgsl
similarity index 86%
rename from test/tint/builtins/gen/var/frexp/368997.wgsl
rename to test/tint/builtins/gen/var/frexp/979800.wgsl
index f323a476c8..500cf91a89 100644
--- a/test/tint/builtins/gen/var/frexp/368997.wgsl
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(vec<3, f32>) -> __frexp_result_vec<3>
-fn frexp_368997() {
+// fn frexp(vec<3, f32>) -> __frexp_result_vec<3, f32>
+fn frexp_979800() {
   var arg_0 = vec3<f32>(1.f);
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_368997();
+  frexp_979800();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_368997();
+  frexp_979800();
 }
diff --git a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.dxc.hlsl
similarity index 90%
rename from test/tint/builtins/gen/var/frexp/368997.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/frexp/979800.wgsl.expected.dxc.hlsl
index a453143f38..a15f9899d8 100644
--- a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec3 tint_frexp(float3 param_0) {
   return result;
 }
 
-void frexp_368997() {
+void frexp_979800() {
   float3 arg_0 = (1.0f).xxx;
   frexp_result_vec3 res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_368997();
+  frexp_979800();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.fxc.hlsl
similarity index 90%
rename from test/tint/builtins/gen/var/frexp/368997.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/frexp/979800.wgsl.expected.fxc.hlsl
index a453143f38..a15f9899d8 100644
--- a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec3 tint_frexp(float3 param_0) {
   return result;
 }
 
-void frexp_368997() {
+void frexp_979800() {
   float3 arg_0 = (1.0f).xxx;
   frexp_result_vec3 res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_368997();
+  frexp_979800();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/var/frexp/368997.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/frexp/979800.wgsl.expected.glsl
index 70fcae6267..256584b731 100644
--- a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.glsl
@@ -12,13 +12,13 @@ frexp_result_vec3 tint_frexp(vec3 param_0) {
 }
 
 
-void frexp_368997() {
+void frexp_979800() {
   vec3 arg_0 = vec3(1.0f);
   frexp_result_vec3 res = tint_frexp(arg_0);
 }
 
 vec4 vertex_main() {
-  frexp_368997();
+  frexp_979800();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ frexp_result_vec3 tint_frexp(vec3 param_0) {
 }
 
 
-void frexp_368997() {
+void frexp_979800() {
   vec3 arg_0 = vec3(1.0f);
   frexp_result_vec3 res = tint_frexp(arg_0);
 }
 
 void fragment_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 void main() {
@@ -72,13 +72,13 @@ frexp_result_vec3 tint_frexp(vec3 param_0) {
 }
 
 
-void frexp_368997() {
+void frexp_979800() {
   vec3 arg_0 = vec3(1.0f);
   frexp_result_vec3 res = tint_frexp(arg_0);
 }
 
 void compute_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.msl b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.msl
similarity index 79%
rename from test/tint/builtins/gen/var/frexp/368997.wgsl.expected.msl
rename to test/tint/builtins/gen/var/frexp/979800.wgsl.expected.msl
index 880edbbb0a..5f511cd8ab 100644
--- a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result_vec3 {
   int3 exp;
 };
 frexp_result_vec3 tint_frexp(float3 param_0) {
-  int3 exp;
-  float3 sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result_vec3 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_368997() {
+void frexp_979800() {
   float3 arg_0 = float3(1.0f);
   frexp_result_vec3 res = tint_frexp(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_368997();
+  frexp_979800();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
 kernel void compute_main() {
-  frexp_368997();
+  frexp_979800();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.spvasm
similarity index 93%
rename from test/tint/builtins/gen/var/frexp/368997.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/frexp/979800.wgsl.expected.spvasm
index 0fc5b26e87..2aed3d5e01 100644
--- a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_368997 "frexp_368997"
+               OpName %frexp_979800 "frexp_979800"
                OpName %arg_0 "arg_0"
                OpName %__frexp_result_vec3 "__frexp_result_vec3"
                OpMemberName %__frexp_result_vec3 0 "sig"
@@ -48,7 +48,7 @@
 %_ptr_Function___frexp_result_vec3 = OpTypePointer Function %__frexp_result_vec3
          %27 = OpConstantNull %__frexp_result_vec3
          %28 = OpTypeFunction %v4float
-%frexp_368997 = OpFunction %void None %9
+%frexp_979800 = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_v3float Function %18
         %res = OpVariable %_ptr_Function___frexp_result_vec3 Function %27
@@ -60,7 +60,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %28
          %30 = OpLabel
-         %31 = OpFunctionCall %void %frexp_368997
+         %31 = OpFunctionCall %void %frexp_979800
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -72,11 +72,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %36 = OpLabel
-         %37 = OpFunctionCall %void %frexp_368997
+         %37 = OpFunctionCall %void %frexp_979800
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %39 = OpLabel
-         %40 = OpFunctionCall %void %frexp_368997
+         %40 = OpFunctionCall %void %frexp_979800
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.wgsl b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.wgsl
similarity index 75%
rename from test/tint/builtins/gen/var/frexp/368997.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/frexp/979800.wgsl.expected.wgsl
index 58847e0810..529fccb8df 100644
--- a/test/tint/builtins/gen/var/frexp/368997.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/frexp/979800.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn frexp_368997() {
+fn frexp_979800() {
   var arg_0 = vec3<f32>(1.0f);
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_368997();
+  frexp_979800();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_368997();
+  frexp_979800();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_368997();
+  frexp_979800();
 }
diff --git a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl b/test/tint/builtins/gen/var/frexp/eb2421.wgsl
similarity index 86%
rename from test/tint/builtins/gen/var/frexp/4bdfc7.wgsl
rename to test/tint/builtins/gen/var/frexp/eb2421.wgsl
index 9e6857d34e..760e5f98ce 100644
--- a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn frexp(vec<2, f32>) -> __frexp_result_vec<2>
-fn frexp_4bdfc7() {
+// fn frexp(vec<2, f32>) -> __frexp_result_vec<2, f32>
+fn frexp_eb2421() {
   var arg_0 = vec2<f32>(1.f);
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
diff --git a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.dxc.hlsl
similarity index 90%
rename from test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.dxc.hlsl
index 2b1bb58d4e..32121e69bb 100644
--- a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.dxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec2 tint_frexp(float2 param_0) {
   return result;
 }
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   float2 arg_0 = (1.0f).xx;
   frexp_result_vec2 res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.fxc.hlsl
similarity index 90%
rename from test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.fxc.hlsl
index 2b1bb58d4e..32121e69bb 100644
--- a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.fxc.hlsl
@@ -9,7 +9,7 @@ frexp_result_vec2 tint_frexp(float2 param_0) {
   return result;
 }
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   float2 arg_0 = (1.0f).xx;
   frexp_result_vec2 res = tint_frexp(arg_0);
 }
@@ -19,7 +19,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +31,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
diff --git a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.glsl b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.glsl
index 9d88b61f2c..a0dc6561f1 100644
--- a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.glsl
@@ -12,13 +12,13 @@ frexp_result_vec2 tint_frexp(vec2 param_0) {
 }
 
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   vec2 arg_0 = vec2(1.0f);
   frexp_result_vec2 res = tint_frexp(arg_0);
 }
 
 vec4 vertex_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ frexp_result_vec2 tint_frexp(vec2 param_0) {
 }
 
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   vec2 arg_0 = vec2(1.0f);
   frexp_result_vec2 res = tint_frexp(arg_0);
 }
 
 void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 void main() {
@@ -72,13 +72,13 @@ frexp_result_vec2 tint_frexp(vec2 param_0) {
 }
 
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   vec2 arg_0 = vec2(1.0f);
   frexp_result_vec2 res = tint_frexp(arg_0);
 }
 
 void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.msl b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.msl
similarity index 79%
rename from test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.msl
rename to test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.msl
index cd5d42b586..95235f23a8 100644
--- a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct frexp_result_vec2 {
   int2 exp;
 };
 frexp_result_vec2 tint_frexp(float2 param_0) {
-  int2 exp;
-  float2 sig = frexp(param_0, exp);
-  return {sig, exp};
+  frexp_result_vec2 result;
+  result.sig = frexp(param_0, result.exp);
+  return result;
 }
 
-void frexp_4bdfc7() {
+void frexp_eb2421() {
   float2 arg_0 = float2(1.0f);
   frexp_result_vec2 res = tint_frexp(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
 kernel void compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.spvasm
similarity index 93%
rename from test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.spvasm
index a0d4a79803..4703e9af39 100644
--- a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %frexp_4bdfc7 "frexp_4bdfc7"
+               OpName %frexp_eb2421 "frexp_eb2421"
                OpName %arg_0 "arg_0"
                OpName %__frexp_result_vec2 "__frexp_result_vec2"
                OpMemberName %__frexp_result_vec2 0 "sig"
@@ -48,7 +48,7 @@
 %_ptr_Function___frexp_result_vec2 = OpTypePointer Function %__frexp_result_vec2
          %27 = OpConstantNull %__frexp_result_vec2
          %28 = OpTypeFunction %v4float
-%frexp_4bdfc7 = OpFunction %void None %9
+%frexp_eb2421 = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_v2float Function %18
         %res = OpVariable %_ptr_Function___frexp_result_vec2 Function %27
@@ -60,7 +60,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %28
          %30 = OpLabel
-         %31 = OpFunctionCall %void %frexp_4bdfc7
+         %31 = OpFunctionCall %void %frexp_eb2421
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -72,11 +72,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %36 = OpLabel
-         %37 = OpFunctionCall %void %frexp_4bdfc7
+         %37 = OpFunctionCall %void %frexp_eb2421
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %39 = OpLabel
-         %40 = OpFunctionCall %void %frexp_4bdfc7
+         %40 = OpFunctionCall %void %frexp_eb2421
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.wgsl b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.wgsl
similarity index 75%
rename from test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.wgsl
index 476cafeaf5..83b52e83d0 100644
--- a/test/tint/builtins/gen/var/frexp/4bdfc7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/frexp/eb2421.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn frexp_4bdfc7() {
+fn frexp_eb2421() {
   var arg_0 = vec2<f32>(1.0f);
   var res = frexp(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  frexp_4bdfc7();
+  frexp_eb2421();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  frexp_4bdfc7();
+  frexp_eb2421();
 }
diff --git a/test/tint/builtins/gen/var/modf/f5f20d.wgsl b/test/tint/builtins/gen/var/modf/2d50da.wgsl
similarity index 87%
rename from test/tint/builtins/gen/var/modf/f5f20d.wgsl
rename to test/tint/builtins/gen/var/modf/2d50da.wgsl
index 1e22ffa65d..d8f067b9b6 100644
--- a/test/tint/builtins/gen/var/modf/f5f20d.wgsl
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(vec<2, f32>) -> __modf_result_vec<2>
-fn modf_f5f20d() {
+// fn modf(vec<2, f32>) -> __modf_result_vec<2, f32>
+fn modf_2d50da() {
   var arg_0 = vec2<f32>(1.f);
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_f5f20d();
+  modf_2d50da();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
diff --git a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.dxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.dxc.hlsl
index 85b34aaf4e..bf9728ea66 100644
--- a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec2 {
   float2 whole;
 };
 modf_result_vec2 tint_modf(float2 param_0) {
-  float2 whole;
-  float2 fract = modf(param_0, whole);
-  modf_result_vec2 result = {fract, whole};
+  modf_result_vec2 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_f5f20d() {
+void modf_2d50da() {
   float2 arg_0 = (1.0f).xx;
   modf_result_vec2 res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_f5f20d();
+  modf_2d50da();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.fxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.fxc.hlsl
index 85b34aaf4e..bf9728ea66 100644
--- a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec2 {
   float2 whole;
 };
 modf_result_vec2 tint_modf(float2 param_0) {
-  float2 whole;
-  float2 fract = modf(param_0, whole);
-  modf_result_vec2 result = {fract, whole};
+  modf_result_vec2 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_f5f20d() {
+void modf_2d50da() {
   float2 arg_0 = (1.0f).xx;
   modf_result_vec2 res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_f5f20d();
+  modf_2d50da();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.glsl
similarity index 92%
rename from test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.glsl
index 9e92000352..a1998b9e45 100644
--- a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.glsl
@@ -12,13 +12,13 @@ modf_result_vec2 tint_modf(vec2 param_0) {
 }
 
 
-void modf_f5f20d() {
+void modf_2d50da() {
   vec2 arg_0 = vec2(1.0f);
   modf_result_vec2 res = tint_modf(arg_0);
 }
 
 vec4 vertex_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ modf_result_vec2 tint_modf(vec2 param_0) {
 }
 
 
-void modf_f5f20d() {
+void modf_2d50da() {
   vec2 arg_0 = vec2(1.0f);
   modf_result_vec2 res = tint_modf(arg_0);
 }
 
 void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 void main() {
@@ -72,13 +72,13 @@ modf_result_vec2 tint_modf(vec2 param_0) {
 }
 
 
-void modf_f5f20d() {
+void modf_2d50da() {
   vec2 arg_0 = vec2(1.0f);
   modf_result_vec2 res = tint_modf(arg_0);
 }
 
 void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.msl b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.msl
similarity index 79%
rename from test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.msl
rename to test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.msl
index 14d0f6f49a..75795761e1 100644
--- a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result_vec2 {
   float2 whole;
 };
 modf_result_vec2 tint_modf(float2 param_0) {
-  float2 whole;
-  float2 fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result_vec2 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_f5f20d() {
+void modf_2d50da() {
   float2 arg_0 = float2(1.0f);
   modf_result_vec2 res = tint_modf(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_f5f20d();
+  modf_2d50da();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
 kernel void compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.spvasm
similarity index 93%
rename from test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.spvasm
index 0b24482ec3..9e6337b8ba 100644
--- a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_f5f20d "modf_f5f20d"
+               OpName %modf_2d50da "modf_2d50da"
                OpName %arg_0 "arg_0"
                OpName %__modf_result_vec2 "__modf_result_vec2"
                OpMemberName %__modf_result_vec2 0 "fract"
@@ -46,7 +46,7 @@
 %_ptr_Function___modf_result_vec2 = OpTypePointer Function %__modf_result_vec2
          %25 = OpConstantNull %__modf_result_vec2
          %26 = OpTypeFunction %v4float
-%modf_f5f20d = OpFunction %void None %9
+%modf_2d50da = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_v2float Function %18
         %res = OpVariable %_ptr_Function___modf_result_vec2 Function %25
@@ -58,7 +58,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %26
          %28 = OpLabel
-         %29 = OpFunctionCall %void %modf_f5f20d
+         %29 = OpFunctionCall %void %modf_2d50da
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -70,11 +70,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %34 = OpLabel
-         %35 = OpFunctionCall %void %modf_f5f20d
+         %35 = OpFunctionCall %void %modf_2d50da
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %37 = OpLabel
-         %38 = OpFunctionCall %void %modf_f5f20d
+         %38 = OpFunctionCall %void %modf_2d50da
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.wgsl b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.wgsl
similarity index 76%
rename from test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.wgsl
index 0e23a250a2..baa503959e 100644
--- a/test/tint/builtins/gen/var/modf/f5f20d.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/modf/2d50da.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn modf_f5f20d() {
+fn modf_2d50da() {
   var arg_0 = vec2<f32>(1.0f);
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_f5f20d();
+  modf_2d50da();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_f5f20d();
+  modf_2d50da();
 }
diff --git a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl b/test/tint/builtins/gen/var/modf/4bfced.wgsl
similarity index 87%
rename from test/tint/builtins/gen/var/modf/ec2dbc.wgsl
rename to test/tint/builtins/gen/var/modf/4bfced.wgsl
index bb6ded0205..4929415af6 100644
--- a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(vec<4, f32>) -> __modf_result_vec<4>
-fn modf_ec2dbc() {
+// fn modf(vec<4, f32>) -> __modf_result_vec<4, f32>
+fn modf_4bfced() {
   var arg_0 = vec4<f32>(1.f);
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_ec2dbc();
+  modf_4bfced();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
diff --git a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.dxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.dxc.hlsl
index 171368d515..0cfe790dc1 100644
--- a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec4 {
   float4 whole;
 };
 modf_result_vec4 tint_modf(float4 param_0) {
-  float4 whole;
-  float4 fract = modf(param_0, whole);
-  modf_result_vec4 result = {fract, whole};
+  modf_result_vec4 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   float4 arg_0 = (1.0f).xxxx;
   modf_result_vec4 res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_ec2dbc();
+  modf_4bfced();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.fxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.fxc.hlsl
index 171368d515..0cfe790dc1 100644
--- a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec4 {
   float4 whole;
 };
 modf_result_vec4 tint_modf(float4 param_0) {
-  float4 whole;
-  float4 fract = modf(param_0, whole);
-  modf_result_vec4 result = {fract, whole};
+  modf_result_vec4 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   float4 arg_0 = (1.0f).xxxx;
   modf_result_vec4 res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_ec2dbc();
+  modf_4bfced();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.glsl
similarity index 92%
rename from test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.glsl
index 891485b2a0..5d5615b40f 100644
--- a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.glsl
@@ -12,13 +12,13 @@ modf_result_vec4 tint_modf(vec4 param_0) {
 }
 
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   vec4 arg_0 = vec4(1.0f);
   modf_result_vec4 res = tint_modf(arg_0);
 }
 
 vec4 vertex_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ modf_result_vec4 tint_modf(vec4 param_0) {
 }
 
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   vec4 arg_0 = vec4(1.0f);
   modf_result_vec4 res = tint_modf(arg_0);
 }
 
 void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 void main() {
@@ -72,13 +72,13 @@ modf_result_vec4 tint_modf(vec4 param_0) {
 }
 
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   vec4 arg_0 = vec4(1.0f);
   modf_result_vec4 res = tint_modf(arg_0);
 }
 
 void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.msl b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.msl
similarity index 79%
rename from test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.msl
rename to test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.msl
index 58350e3675..4bac39e4e9 100644
--- a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result_vec4 {
   float4 whole;
 };
 modf_result_vec4 tint_modf(float4 param_0) {
-  float4 whole;
-  float4 fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result_vec4 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_ec2dbc() {
+void modf_4bfced() {
   float4 arg_0 = float4(1.0f);
   modf_result_vec4 res = tint_modf(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_ec2dbc();
+  modf_4bfced();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
 kernel void compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.spvasm
similarity index 93%
rename from test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.spvasm
index 3b90f6d0de..44dedfe0c6 100644
--- a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_ec2dbc "modf_ec2dbc"
+               OpName %modf_4bfced "modf_4bfced"
                OpName %arg_0 "arg_0"
                OpName %__modf_result_vec4 "__modf_result_vec4"
                OpMemberName %__modf_result_vec4 0 "fract"
@@ -44,7 +44,7 @@
 %_ptr_Function___modf_result_vec4 = OpTypePointer Function %__modf_result_vec4
          %23 = OpConstantNull %__modf_result_vec4
          %24 = OpTypeFunction %v4float
-%modf_ec2dbc = OpFunction %void None %9
+%modf_4bfced = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_v4float Function %5
         %res = OpVariable %_ptr_Function___modf_result_vec4 Function %23
@@ -56,7 +56,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %24
          %26 = OpLabel
-         %27 = OpFunctionCall %void %modf_ec2dbc
+         %27 = OpFunctionCall %void %modf_4bfced
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -68,11 +68,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %32 = OpLabel
-         %33 = OpFunctionCall %void %modf_ec2dbc
+         %33 = OpFunctionCall %void %modf_4bfced
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %35 = OpLabel
-         %36 = OpFunctionCall %void %modf_ec2dbc
+         %36 = OpFunctionCall %void %modf_4bfced
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.wgsl b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.wgsl
similarity index 76%
rename from test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.wgsl
index 5e010e0608..cff6f57977 100644
--- a/test/tint/builtins/gen/var/modf/ec2dbc.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/modf/4bfced.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn modf_ec2dbc() {
+fn modf_4bfced() {
   var arg_0 = vec4<f32>(1.0f);
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_ec2dbc();
+  modf_4bfced();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_ec2dbc();
+  modf_4bfced();
 }
diff --git a/test/tint/builtins/gen/var/modf/9b75f7.wgsl b/test/tint/builtins/gen/var/modf/5ea256.wgsl
similarity index 87%
rename from test/tint/builtins/gen/var/modf/9b75f7.wgsl
rename to test/tint/builtins/gen/var/modf/5ea256.wgsl
index 3afdb09278..f85cfeb5af 100644
--- a/test/tint/builtins/gen/var/modf/9b75f7.wgsl
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(vec<3, f32>) -> __modf_result_vec<3>
-fn modf_9b75f7() {
+// fn modf(vec<3, f32>) -> __modf_result_vec<3, f32>
+fn modf_5ea256() {
   var arg_0 = vec3<f32>(1.f);
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_9b75f7();
+  modf_5ea256();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
diff --git a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.dxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.dxc.hlsl
index 3ced5276a0..ffd6a125b3 100644
--- a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec3 {
   float3 whole;
 };
 modf_result_vec3 tint_modf(float3 param_0) {
-  float3 whole;
-  float3 fract = modf(param_0, whole);
-  modf_result_vec3 result = {fract, whole};
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_9b75f7() {
+void modf_5ea256() {
   float3 arg_0 = (1.0f).xxx;
   modf_result_vec3 res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_9b75f7();
+  modf_5ea256();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.fxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.fxc.hlsl
index 3ced5276a0..ffd6a125b3 100644
--- a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result_vec3 {
   float3 whole;
 };
 modf_result_vec3 tint_modf(float3 param_0) {
-  float3 whole;
-  float3 fract = modf(param_0, whole);
-  modf_result_vec3 result = {fract, whole};
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_9b75f7() {
+void modf_5ea256() {
   float3 arg_0 = (1.0f).xxx;
   modf_result_vec3 res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_9b75f7();
+  modf_5ea256();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.glsl
similarity index 92%
rename from test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.glsl
index 857d89ea23..021cf81383 100644
--- a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.glsl
@@ -12,13 +12,13 @@ modf_result_vec3 tint_modf(vec3 param_0) {
 }
 
 
-void modf_9b75f7() {
+void modf_5ea256() {
   vec3 arg_0 = vec3(1.0f);
   modf_result_vec3 res = tint_modf(arg_0);
 }
 
 vec4 vertex_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ modf_result_vec3 tint_modf(vec3 param_0) {
 }
 
 
-void modf_9b75f7() {
+void modf_5ea256() {
   vec3 arg_0 = vec3(1.0f);
   modf_result_vec3 res = tint_modf(arg_0);
 }
 
 void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 void main() {
@@ -72,13 +72,13 @@ modf_result_vec3 tint_modf(vec3 param_0) {
 }
 
 
-void modf_9b75f7() {
+void modf_5ea256() {
   vec3 arg_0 = vec3(1.0f);
   modf_result_vec3 res = tint_modf(arg_0);
 }
 
 void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.msl b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.msl
similarity index 79%
rename from test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.msl
rename to test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.msl
index 465974d68b..fa5d28af5a 100644
--- a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result_vec3 {
   float3 whole;
 };
 modf_result_vec3 tint_modf(float3 param_0) {
-  float3 whole;
-  float3 fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result_vec3 result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_9b75f7() {
+void modf_5ea256() {
   float3 arg_0 = float3(1.0f);
   modf_result_vec3 res = tint_modf(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_9b75f7();
+  modf_5ea256();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
 kernel void compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.spvasm
similarity index 93%
rename from test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.spvasm
index 247b3bbd9b..1587506574 100644
--- a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_9b75f7 "modf_9b75f7"
+               OpName %modf_5ea256 "modf_5ea256"
                OpName %arg_0 "arg_0"
                OpName %__modf_result_vec3 "__modf_result_vec3"
                OpMemberName %__modf_result_vec3 0 "fract"
@@ -46,7 +46,7 @@
 %_ptr_Function___modf_result_vec3 = OpTypePointer Function %__modf_result_vec3
          %25 = OpConstantNull %__modf_result_vec3
          %26 = OpTypeFunction %v4float
-%modf_9b75f7 = OpFunction %void None %9
+%modf_5ea256 = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_v3float Function %18
         %res = OpVariable %_ptr_Function___modf_result_vec3 Function %25
@@ -58,7 +58,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %26
          %28 = OpLabel
-         %29 = OpFunctionCall %void %modf_9b75f7
+         %29 = OpFunctionCall %void %modf_5ea256
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -70,11 +70,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %34 = OpLabel
-         %35 = OpFunctionCall %void %modf_9b75f7
+         %35 = OpFunctionCall %void %modf_5ea256
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %37 = OpLabel
-         %38 = OpFunctionCall %void %modf_9b75f7
+         %38 = OpFunctionCall %void %modf_5ea256
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.wgsl b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.wgsl
similarity index 76%
rename from test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.wgsl
index 04423342fb..5180d1456a 100644
--- a/test/tint/builtins/gen/var/modf/9b75f7.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/modf/5ea256.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn modf_9b75f7() {
+fn modf_5ea256() {
   var arg_0 = vec3<f32>(1.0f);
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_9b75f7();
+  modf_5ea256();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_9b75f7();
+  modf_5ea256();
 }
diff --git a/test/tint/builtins/gen/var/modf/180fed.wgsl b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl
similarity index 88%
rename from test/tint/builtins/gen/var/modf/180fed.wgsl
rename to test/tint/builtins/gen/var/modf/bbf7f7.wgsl
index 5a2ca72c14..60ab469def 100644
--- a/test/tint/builtins/gen/var/modf/180fed.wgsl
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl
@@ -1,4 +1,4 @@
-// Copyright 2021 The Tint Authors.
+// Copyright 2022 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,24 +21,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-// fn modf(f32) -> __modf_result
-fn modf_180fed() {
+// fn modf(f32) -> __modf_result<f32>
+fn modf_bbf7f7() {
   var arg_0 = 1.f;
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_180fed();
+  modf_bbf7f7();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
diff --git a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.dxc.hlsl b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.dxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/180fed.wgsl.expected.dxc.hlsl
rename to test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.dxc.hlsl
index 9e7075214a..39adf2d7b4 100644
--- a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.dxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_180fed() {
+void modf_bbf7f7() {
   float arg_0 = 1.0f;
   modf_result res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_180fed();
+  modf_bbf7f7();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.fxc.hlsl b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.fxc.hlsl
similarity index 77%
rename from test/tint/builtins/gen/var/modf/180fed.wgsl.expected.fxc.hlsl
rename to test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.fxc.hlsl
index 9e7075214a..39adf2d7b4 100644
--- a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.fxc.hlsl
@@ -3,13 +3,12 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
-void modf_180fed() {
+void modf_bbf7f7() {
   float arg_0 = 1.0f;
   modf_result res = tint_modf(arg_0);
 }
@@ -19,7 +18,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_180fed();
+  modf_bbf7f7();
   return (0.0f).xxxx;
 }
 
@@ -31,12 +30,12 @@ tint_symbol vertex_main() {
 }
 
 void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
 [numthreads(1, 1, 1)]
 void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
diff --git a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.glsl b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.glsl
similarity index 91%
rename from test/tint/builtins/gen/var/modf/180fed.wgsl.expected.glsl
rename to test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.glsl
index c3d2897a49..4907635438 100644
--- a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.glsl
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.glsl
@@ -12,13 +12,13 @@ modf_result tint_modf(float param_0) {
 }
 
 
-void modf_180fed() {
+void modf_bbf7f7() {
   float arg_0 = 1.0f;
   modf_result res = tint_modf(arg_0);
 }
 
 vec4 vertex_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return vec4(0.0f);
 }
 
@@ -45,13 +45,13 @@ modf_result tint_modf(float param_0) {
 }
 
 
-void modf_180fed() {
+void modf_bbf7f7() {
   float arg_0 = 1.0f;
   modf_result res = tint_modf(arg_0);
 }
 
 void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 void main() {
@@ -72,13 +72,13 @@ modf_result tint_modf(float param_0) {
 }
 
 
-void modf_180fed() {
+void modf_bbf7f7() {
   float arg_0 = 1.0f;
   modf_result res = tint_modf(arg_0);
 }
 
 void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.msl b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.msl
similarity index 79%
rename from test/tint/builtins/gen/var/modf/180fed.wgsl.expected.msl
rename to test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.msl
index 2dc20e6059..2ef62514a5 100644
--- a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.msl
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.msl
@@ -7,12 +7,12 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
-void modf_180fed() {
+void modf_bbf7f7() {
   float arg_0 = 1.0f;
   modf_result res = tint_modf(arg_0);
 }
@@ -22,7 +22,7 @@ struct tint_symbol {
 };
 
 float4 vertex_main_inner() {
-  modf_180fed();
+  modf_bbf7f7();
   return float4(0.0f);
 }
 
@@ -34,12 +34,12 @@ vertex tint_symbol vertex_main() {
 }
 
 fragment void fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
 kernel void compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
   return;
 }
 
diff --git a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.spvasm b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.spvasm
similarity index 92%
rename from test/tint/builtins/gen/var/modf/180fed.wgsl.expected.spvasm
rename to test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.spvasm
index 67e2e30541..97fe5104d6 100644
--- a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.spvasm
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.spvasm
@@ -13,7 +13,7 @@
                OpExecutionMode %compute_main LocalSize 1 1 1
                OpName %value "value"
                OpName %vertex_point_size "vertex_point_size"
-               OpName %modf_180fed "modf_180fed"
+               OpName %modf_bbf7f7 "modf_bbf7f7"
                OpName %arg_0 "arg_0"
                OpName %__modf_result "__modf_result"
                OpMemberName %__modf_result 0 "fract"
@@ -43,7 +43,7 @@
 %_ptr_Function___modf_result = OpTypePointer Function %__modf_result
          %22 = OpConstantNull %__modf_result
          %23 = OpTypeFunction %v4float
-%modf_180fed = OpFunction %void None %9
+%modf_bbf7f7 = OpFunction %void None %9
          %12 = OpLabel
       %arg_0 = OpVariable %_ptr_Function_float Function %8
         %res = OpVariable %_ptr_Function___modf_result Function %22
@@ -55,7 +55,7 @@
                OpFunctionEnd
 %vertex_main_inner = OpFunction %v4float None %23
          %25 = OpLabel
-         %26 = OpFunctionCall %void %modf_180fed
+         %26 = OpFunctionCall %void %modf_bbf7f7
                OpReturnValue %5
                OpFunctionEnd
 %vertex_main = OpFunction %void None %9
@@ -67,11 +67,11 @@
                OpFunctionEnd
 %fragment_main = OpFunction %void None %9
          %31 = OpLabel
-         %32 = OpFunctionCall %void %modf_180fed
+         %32 = OpFunctionCall %void %modf_bbf7f7
                OpReturn
                OpFunctionEnd
 %compute_main = OpFunction %void None %9
          %34 = OpLabel
-         %35 = OpFunctionCall %void %modf_180fed
+         %35 = OpFunctionCall %void %modf_bbf7f7
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.wgsl b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.wgsl
similarity index 75%
rename from test/tint/builtins/gen/var/modf/180fed.wgsl.expected.wgsl
rename to test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.wgsl
index 9b9d885b39..0ebdc4bb05 100644
--- a/test/tint/builtins/gen/var/modf/180fed.wgsl.expected.wgsl
+++ b/test/tint/builtins/gen/var/modf/bbf7f7.wgsl.expected.wgsl
@@ -1,20 +1,20 @@
-fn modf_180fed() {
+fn modf_bbf7f7() {
   var arg_0 = 1.0f;
   var res = modf(arg_0);
 }
 
 @vertex
 fn vertex_main() -> @builtin(position) vec4<f32> {
-  modf_180fed();
+  modf_bbf7f7();
   return vec4<f32>();
 }
 
 @fragment
 fn fragment_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
 
 @compute @workgroup_size(1)
 fn compute_main() {
-  modf_180fed();
+  modf_bbf7f7();
 }
diff --git a/test/tint/builtins/modf.wgsl.expected.dxc.hlsl b/test/tint/builtins/modf.wgsl.expected.dxc.hlsl
index d2bdca4499..6ea70f3eed 100644
--- a/test/tint/builtins/modf.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/modf.wgsl.expected.dxc.hlsl
@@ -3,9 +3,8 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
diff --git a/test/tint/builtins/modf.wgsl.expected.fxc.hlsl b/test/tint/builtins/modf.wgsl.expected.fxc.hlsl
index d2bdca4499..6ea70f3eed 100644
--- a/test/tint/builtins/modf.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/modf.wgsl.expected.fxc.hlsl
@@ -3,9 +3,8 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  modf_result result = {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
   return result;
 }
 
diff --git a/test/tint/builtins/modf.wgsl.expected.msl b/test/tint/builtins/modf.wgsl.expected.msl
index 6f6cf69501..108250d0ae 100644
--- a/test/tint/builtins/modf.wgsl.expected.msl
+++ b/test/tint/builtins/modf.wgsl.expected.msl
@@ -7,9 +7,9 @@ struct modf_result {
   float whole;
 };
 modf_result tint_modf(float param_0) {
-  float whole;
-  float fract = modf(param_0, whole);
-  return {fract, whole};
+  modf_result result;
+  result.fract = modf(param_0, result.whole);
+  return result;
 }
 
 kernel void tint_symbol() {