Remove isNan, isInf, isFinite, and isNormal

These were deprecated in M98.

Fixed: tint:1312
Change-Id: Ieec17bfcc729f90d0a9aa8904a162167b9de54ed
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/82800
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
diff --git a/docs/tint/origin-trial-changes.md b/docs/tint/origin-trial-changes.md
index 7e94658..93e0708 100644
--- a/docs/tint/origin-trial-changes.md
+++ b/docs/tint/origin-trial-changes.md
@@ -6,6 +6,10 @@
 
 * Tint now supports unicode identifiers. [tint:1437](crbug.com/tint/1437)
 
+### Breaking changes
+
+* The `isNan()`, `isInf()`, `isFinite()`, and `isNormal()` builtins have been removed. [tint:1312](https://crbug.com/tint/1312)
+
 ## Changes for M100
 
 ### Breaking changes
diff --git a/docs/tint/translations.md b/docs/tint/translations.md
index b22ed20..5119434 100644
--- a/docs/tint/translations.md
+++ b/docs/tint/translations.md
@@ -75,10 +75,6 @@
 | fwidthCoarse | SpvOpFwidthCoarse | fwidth | fwidth |
 | fwidthFine | SpvOpFwidthFine | fwidth | fwidth |
 | inverseSqrt | GLSLstd450InverseSqrt | rsqrt | rsqrt |
-| isFinite | | isfinite | isfinite |
-| isInf | SpvOpIsInf | isinf | isinf |
-| isNan | SpvOpIsNan | isnan | isnan |
-| isNormal | | isnormal | |
 | ldexp | GLSLstd450Ldexp | | |
 | length | GLSLstd450Length | length | length |
 | log | GLSLstd450Log | log | log |
diff --git a/src/tint/builtin_table.inl b/src/tint/builtin_table.inl
index 72d8c34..f2bbd1e 100644
--- a/src/tint/builtin_table.inl
+++ b/src/tint/builtin_table.inl
@@ -1662,10 +1662,10 @@
   /* [20] */ 2,
   /* [21] */ 8,
   /* [22] */ 0,
-  /* [23] */ 1,
+  /* [23] */ 2,
   /* [24] */ 8,
   /* [25] */ 0,
-  /* [26] */ 2,
+  /* [26] */ 1,
   /* [27] */ 29,
   /* [28] */ 0,
   /* [29] */ 1,
@@ -1722,56 +1722,56 @@
   /* [80] */ 3,
   /* [81] */ 5,
   /* [82] */ 2,
-  /* [83] */ 16,
+  /* [83] */ 7,
   /* [84] */ 2,
   /* [85] */ 5,
   /* [86] */ 3,
-  /* [87] */ 7,
+  /* [87] */ 17,
   /* [88] */ 2,
-  /* [89] */ 17,
+  /* [89] */ 16,
   /* [90] */ 2,
   /* [91] */ 6,
   /* [92] */ 2,
-  /* [93] */ 20,
+  /* [93] */ 18,
   /* [94] */ 2,
-  /* [95] */ 18,
+  /* [95] */ 20,
   /* [96] */ 2,
-  /* [97] */ 19,
-  /* [98] */ 2,
-  /* [99] */ 6,
-  /* [100] */ 3,
+  /* [97] */ 6,
+  /* [98] */ 3,
+  /* [99] */ 19,
+  /* [100] */ 2,
   /* [101] */ 35,
   /* [102] */ 0,
   /* [103] */ 33,
   /* [104] */ 0,
-  /* [105] */ 5,
-  /* [106] */ 0,
+  /* [105] */ 7,
+  /* [106] */ 3,
   /* [107] */ 7,
-  /* [108] */ 3,
-  /* [109] */ 7,
-  /* [110] */ 4,
-  /* [111] */ 15,
+  /* [108] */ 4,
+  /* [109] */ 15,
+  /* [110] */ 0,
+  /* [111] */ 7,
   /* [112] */ 0,
-  /* [113] */ 7,
+  /* [113] */ 16,
   /* [114] */ 0,
-  /* [115] */ 16,
+  /* [115] */ 17,
   /* [116] */ 0,
-  /* [117] */ 17,
+  /* [117] */ 18,
   /* [118] */ 0,
-  /* [119] */ 18,
+  /* [119] */ 21,
   /* [120] */ 0,
-  /* [121] */ 21,
+  /* [121] */ 19,
   /* [122] */ 0,
-  /* [123] */ 19,
+  /* [123] */ 20,
   /* [124] */ 0,
-  /* [125] */ 20,
-  /* [126] */ 0,
-  /* [127] */ 15,
-  /* [128] */ 2,
-  /* [129] */ 24,
+  /* [125] */ 15,
+  /* [126] */ 2,
+  /* [127] */ 5,
+  /* [128] */ 0,
+  /* [129] */ 14,
   /* [130] */ 25,
-  /* [131] */ 14,
-  /* [132] */ 23,
+  /* [131] */ 23,
+  /* [132] */ 24,
   /* [133] */ 22,
   /* [134] */ 26,
   /* [135] */ 13,
@@ -1790,7 +1790,7 @@
   {
     /* [0] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [1] */
@@ -1825,7 +1825,7 @@
   {
     /* [7] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[95],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [8] */
@@ -1835,32 +1835,32 @@
   {
     /* [9] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [10] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [11] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [12] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[99],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [13] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [14] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [15] */
@@ -1874,7 +1874,7 @@
   },
   {
     /* [17] */
-    /* usage */ ParameterUsage::kDepthRef,
+    /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
@@ -1885,7 +1885,7 @@
   {
     /* [19] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [20] */
@@ -1904,8 +1904,8 @@
   },
   {
     /* [23] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [24] */
@@ -1915,12 +1915,12 @@
   {
     /* [25] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [26] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [27] */
@@ -1944,30 +1944,30 @@
   },
   {
     /* [31] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
+    /* usage */ ParameterUsage::kComponent,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [32] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [33] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [33] */
+    /* [34] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[81],
   },
   {
-    /* [34] */
+    /* [35] */
     /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
-    /* [35] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
     /* [36] */
     /* usage */ ParameterUsage::kOffset,
     /* matcher indices */ &kMatcherIndices[85],
@@ -1975,7 +1975,7 @@
   {
     /* [37] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [38] */
@@ -1989,13 +1989,13 @@
   },
   {
     /* [40] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [41] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [42] */
@@ -2005,7 +2005,7 @@
   {
     /* [43] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [44] */
@@ -2015,32 +2015,32 @@
   {
     /* [45] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [46] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [47] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [48] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [49] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [50] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [51] */
@@ -2054,23 +2054,23 @@
   },
   {
     /* [53] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [54] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [55] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [56] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [57] */
@@ -2094,38 +2094,38 @@
   },
   {
     /* [61] */
-    /* usage */ ParameterUsage::kComponent,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[95],
   },
   {
     /* [62] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[117],
-  },
-  {
-    /* [63] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [64] */
+    /* [63] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
-    /* [65] */
+    /* [64] */
     /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
+    /* [65] */
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
     /* [66] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [67] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[93],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [68] */
@@ -2135,7 +2135,7 @@
   {
     /* [69] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [70] */
@@ -2145,17 +2145,17 @@
   {
     /* [71] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [72] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [73] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [74] */
@@ -2169,8 +2169,8 @@
   },
   {
     /* [76] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [77] */
@@ -2180,17 +2180,17 @@
   {
     /* [78] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [79] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [80] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [81] */
@@ -2205,7 +2205,7 @@
   {
     /* [83] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [84] */
@@ -2230,37 +2230,37 @@
   {
     /* [88] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [89] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [90] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [91] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [92] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [93] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[95],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [94] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [95] */
@@ -2269,18 +2269,18 @@
   },
   {
     /* [96] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [97] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [98] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[97],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [99] */
@@ -2304,28 +2304,28 @@
   },
   {
     /* [103] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
+    /* usage */ ParameterUsage::kComponent,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [104] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[123],
+  },
+  {
+    /* [105] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [105] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
-  },
-  {
     /* [106] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [107] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [108] */
@@ -2335,7 +2335,7 @@
   {
     /* [109] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [110] */
@@ -2349,23 +2349,23 @@
   },
   {
     /* [112] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [113] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [114] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [115] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [116] */
@@ -2374,13 +2374,13 @@
   },
   {
     /* [117] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [118] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
+    /* matcher indices */ &kMatcherIndices[99],
   },
   {
     /* [119] */
@@ -2390,62 +2390,62 @@
   {
     /* [120] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [121] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [122] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [123] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* usage */ ParameterUsage::kComponent,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [124] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [125] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [125] */
+    /* [126] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[81],
   },
   {
-    /* [126] */
+    /* [127] */
     /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
-    /* [127] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
-  },
-  {
     /* [128] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* usage */ ParameterUsage::kComponent,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [129] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
   },
   {
     /* [130] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [131] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [132] */
@@ -2454,68 +2454,68 @@
   },
   {
     /* [133] */
-    /* usage */ ParameterUsage::kComponent,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [134] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[125],
-  },
-  {
-    /* [135] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [136] */
+    /* [135] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [136] */
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [137] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [138] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[95],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [139] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [140] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [141] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kDepthRef,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [142] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[99],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [143] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[93],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [144] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [145] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [146] */
@@ -2524,38 +2524,38 @@
   },
   {
     /* [147] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kDepthRef,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [148] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [149] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [150] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [151] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [152] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [153] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [154] */
@@ -2565,52 +2565,52 @@
   {
     /* [155] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [156] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [157] */
     /* usage */ ParameterUsage::kBias,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
+    /* [157] */
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[97],
+  },
+  {
     /* [158] */
-    /* usage */ ParameterUsage::kComponent,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [159] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[117],
-  },
-  {
-    /* [160] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [161] */
+    /* [160] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[81],
   },
   {
-    /* [162] */
+    /* [161] */
     /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
+    /* [162] */
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
+  },
+  {
     /* [163] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [164] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [165] */
@@ -2619,23 +2619,23 @@
   },
   {
     /* [166] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [167] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [168] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [169] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [170] */
@@ -2649,7 +2649,7 @@
   },
   {
     /* [172] */
-    /* usage */ ParameterUsage::kDepthRef,
+    /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
@@ -2669,18 +2669,18 @@
   },
   {
     /* [176] */
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [177] */
     /* usage */ ParameterUsage::kBias,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [177] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[99],
-  },
-  {
     /* [178] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [179] */
@@ -2694,13 +2694,13 @@
   },
   {
     /* [181] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [182] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [183] */
@@ -2719,38 +2719,38 @@
   },
   {
     /* [186] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [187] */
-    /* usage */ ParameterUsage::kBias,
+    /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
+    /* [187] */
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[97],
+  },
+  {
     /* [188] */
-    /* usage */ ParameterUsage::kComponent,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[95],
   },
   {
     /* [189] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[115],
-  },
-  {
-    /* [190] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [191] */
+    /* [190] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [191] */
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [192] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [193] */
@@ -2760,7 +2760,7 @@
   {
     /* [194] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [195] */
@@ -2780,7 +2780,7 @@
   {
     /* [198] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [199] */
@@ -2794,48 +2794,48 @@
   },
   {
     /* [201] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [202] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [203] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [204] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [205] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [206] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [207] */
     /* usage */ ParameterUsage::kDepthRef,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
+    /* [207] */
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
+  },
+  {
     /* [208] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [209] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [210] */
@@ -2844,23 +2844,23 @@
   },
   {
     /* [211] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [212] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [213] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [214] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [215] */
@@ -2874,13 +2874,13 @@
   },
   {
     /* [217] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [218] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [219] */
@@ -2890,27 +2890,27 @@
   {
     /* [220] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [221] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [222] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [223] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [224] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [225] */
@@ -2919,48 +2919,48 @@
   },
   {
     /* [226] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [227] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
-  },
-  {
-    /* [228] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [229] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [230] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
-  },
-  {
-    /* [231] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
+    /* [228] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [229] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [230] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
+  },
+  {
+    /* [231] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
     /* [232] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [233] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [234] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[97],
+    /* matcher indices */ &kMatcherIndices[99],
   },
   {
     /* [235] */
@@ -2974,13 +2974,13 @@
   },
   {
     /* [237] */
-    /* usage */ ParameterUsage::kBias,
+    /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [238] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [239] */
@@ -2990,17 +2990,17 @@
   {
     /* [240] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [241] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [242] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [243] */
@@ -3014,53 +3014,53 @@
   },
   {
     /* [245] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [246] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[97],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [247] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [248] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [249] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kDepthRef,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [250] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[69],
   },
   {
     /* [251] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [252] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [253] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[83],
   },
   {
     /* [254] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[95],
+    /* matcher indices */ &kMatcherIndices[99],
   },
   {
     /* [255] */
@@ -3074,73 +3074,73 @@
   },
   {
     /* [257] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kBias,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [258] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[45],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [259] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [260] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [261] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[109],
-  },
-  {
-    /* [262] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
-  },
-  {
-    /* [263] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
-  },
-  {
-    /* [264] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[81],
   },
   {
-    /* [265] */
-    /* usage */ ParameterUsage::kDepthRef,
+    /* [261] */
+    /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
+    /* [262] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[57],
+  },
+  {
+    /* [263] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[85],
+  },
+  {
+    /* [264] */
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [265] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[105],
+  },
+  {
     /* [266] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [267] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [268] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [269] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [270] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [271] */
@@ -3154,53 +3154,53 @@
   },
   {
     /* [273] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kBias,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [274] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[45],
   },
   {
     /* [275] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
-  },
-  {
-    /* [276] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
-  },
-  {
-    /* [277] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [278] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[117],
-  },
-  {
-    /* [279] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[85],
   },
   {
-    /* [280] */
+    /* [276] */
     /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
+    /* [277] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
+  },
+  {
+    /* [278] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[130],
+  },
+  {
+    /* [279] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [280] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
     /* [281] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [282] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [283] */
@@ -3214,53 +3214,53 @@
   },
   {
     /* [285] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
-  },
-  {
-    /* [286] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[69],
-  },
-  {
-    /* [287] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
-  },
-  {
-    /* [288] */
     /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
-    /* [289] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[87],
-  },
-  {
-    /* [290] */
+    /* [286] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[93],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
-    /* [291] */
+    /* [287] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [292] */
+    /* [288] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [289] */
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
+  },
+  {
+    /* [290] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [291] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[85],
+  },
+  {
+    /* [292] */
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [293] */
-    /* usage */ ParameterUsage::kArrayIndex,
+    /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [294] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[95],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [295] */
@@ -3270,37 +3270,37 @@
   {
     /* [296] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [297] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[99],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [298] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [299] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [300] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [301] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [302] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [303] */
@@ -3314,33 +3314,33 @@
   },
   {
     /* [305] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [306] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [307] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
   },
   {
     /* [308] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [309] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [310] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
+    /* matcher indices */ &kMatcherIndices[95],
   },
   {
     /* [311] */
@@ -3350,177 +3350,177 @@
   {
     /* [312] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [313] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [314] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[89],
-  },
-  {
-    /* [315] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
-  },
-  {
-    /* [316] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
-  },
-  {
-    /* [317] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [318] */
-    /* usage */ ParameterUsage::kComponent,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [319] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[123],
-  },
-  {
-    /* [320] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
-  },
-  {
-    /* [321] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
-  },
-  {
-    /* [322] */
-    /* usage */ ParameterUsage::kComponent,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [323] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[115],
-  },
-  {
-    /* [324] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
-  },
-  {
-    /* [325] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
-  },
-  {
-    /* [326] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
-  },
-  {
-    /* [327] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
-  },
-  {
-    /* [328] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
-  },
-  {
-    /* [329] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [330] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [331] */
-    /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[131],
   },
   {
-    /* [332] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
-  },
-  {
-    /* [333] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [334] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [335] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
-  },
-  {
-    /* [336] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
-  },
-  {
-    /* [337] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [338] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
-  },
-  {
-    /* [339] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
-  },
-  {
-    /* [340] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [341] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [342] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[57],
-  },
-  {
-    /* [343] */
+    /* [315] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[85],
   },
   {
-    /* [344] */
+    /* [316] */
     /* usage */ ParameterUsage::kArrayIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
+    /* [317] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [318] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
+  },
+  {
+    /* [319] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [320] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [321] */
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [322] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[93],
+  },
+  {
+    /* [323] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [324] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [325] */
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[97],
+  },
+  {
+    /* [326] */
+    /* usage */ ParameterUsage::kComponent,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [327] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[121],
+  },
+  {
+    /* [328] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [329] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [330] */
+    /* usage */ ParameterUsage::kComponent,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [331] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
+  },
+  {
+    /* [332] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [333] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [334] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
+  },
+  {
+    /* [335] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [336] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [337] */
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [338] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
+  },
+  {
+    /* [339] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [340] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [341] */
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [342] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
+    /* [343] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [344] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
     /* [345] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[107],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [346] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[95],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [347] */
@@ -3539,33 +3539,33 @@
   },
   {
     /* [350] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[48],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
   },
   {
     /* [351] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [352] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[109],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [353] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [354] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [355] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [356] */
@@ -3625,77 +3625,77 @@
   {
     /* [367] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[87],
+    /* matcher indices */ &kMatcherIndices[83],
   },
   {
     /* [368] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[72],
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [369] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
-  },
-  {
-    /* [370] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[87],
-  },
-  {
-    /* [371] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [372] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [373] */
+    /* [370] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[91],
   },
   {
+    /* [371] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[72],
+  },
+  {
+    /* [372] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[85],
+  },
+  {
+    /* [373] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[83],
+  },
+  {
     /* [374] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [375] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [376] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [377] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[66],
   },
   {
+    /* [375] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[97],
+  },
+  {
+    /* [376] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[83],
+  },
+  {
+    /* [377] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[63],
+  },
+  {
     /* [378] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[99],
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [379] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[87],
+    /* matcher indices */ &kMatcherIndices[105],
   },
   {
     /* [380] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [381] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [382] */
@@ -3705,122 +3705,122 @@
   {
     /* [383] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[63],
+    /* matcher indices */ &kMatcherIndices[60],
   },
   {
     /* [384] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [385] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[107],
+    /* matcher indices */ &kMatcherIndices[105],
   },
   {
     /* [386] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[60],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [387] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [388] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[107],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [389] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [390] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [391] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [392] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [393] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [394] */
-    /* usage */ ParameterUsage::kNone,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [395] */
+    /* [392] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[54],
+    /* matcher indices */ &kMatcherIndices[125],
   },
   {
-    /* [396] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[99],
-  },
-  {
-    /* [397] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[107],
-  },
-  {
-    /* [398] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[0],
-  },
-  {
-    /* [399] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
-  },
-  {
-    /* [400] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
-  },
-  {
-    /* [401] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[51],
-  },
-  {
-    /* [402] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [403] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[109],
-  },
-  {
-    /* [404] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [405] */
+    /* [393] */
     /* usage */ ParameterUsage::kSampler,
     /* matcher indices */ &kMatcherIndices[135],
   },
   {
-    /* [406] */
+    /* [394] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [395] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [396] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [397] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [398] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [399] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [400] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [401] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [402] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [403] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [404] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[54],
+  },
+  {
+    /* [405] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[97],
+  },
+  {
+    /* [406] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[105],
   },
   {
     /* [407] */
@@ -3839,133 +3839,133 @@
   },
   {
     /* [410] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[51],
   },
   {
     /* [411] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [412] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[21],
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
   },
   {
     /* [413] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[48],
   },
   {
     /* [414] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
-  },
-  {
-    /* [415] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[10],
-  },
-  {
-    /* [416] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
-  },
-  {
-    /* [417] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
-  },
-  {
-    /* [418] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[10],
-  },
-  {
-    /* [419] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [420] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [421] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [422] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[42],
-  },
-  {
-    /* [423] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[99],
-  },
-  {
-    /* [424] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[109],
-  },
-  {
-    /* [425] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [426] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [427] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [428] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[111],
-  },
-  {
-    /* [429] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [430] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [431] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[115],
-  },
-  {
-    /* [432] */
     /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[85],
   },
   {
-    /* [433] */
+    /* [415] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
+  },
+  {
+    /* [416] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[42],
+  },
+  {
+    /* [417] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[97],
+  },
+  {
+    /* [418] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
+  },
+  {
+    /* [419] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
+  },
+  {
+    /* [420] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [421] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [422] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[109],
+  },
+  {
+    /* [423] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [424] */
     /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
+    /* [425] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
+  },
+  {
+    /* [426] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
+  },
+  {
+    /* [427] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
+  },
+  {
+    /* [428] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[89],
+  },
+  {
+    /* [429] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [430] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [431] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [432] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [433] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
     /* [434] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[119],
+    /* matcher indices */ &kMatcherIndices[117],
   },
   {
     /* [435] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[99],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [436] */
@@ -3989,38 +3989,38 @@
   },
   {
     /* [440] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[119],
   },
   {
     /* [441] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [442] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* usage */ ParameterUsage::kSampleIndex,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [443] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[97],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [444] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [445] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [446] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [447] */
@@ -4029,13 +4029,13 @@
   },
   {
     /* [448] */
-    /* usage */ ParameterUsage::kSampleIndex,
+    /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [449] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[95],
+    /* matcher indices */ &kMatcherIndices[99],
   },
   {
     /* [450] */
@@ -4050,7 +4050,7 @@
   {
     /* [452] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[134],
   },
   {
     /* [453] */
@@ -4059,13 +4059,13 @@
   },
   {
     /* [454] */
-    /* usage */ ParameterUsage::kLevel,
+    /* usage */ ParameterUsage::kSampleIndex,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [455] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[127],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [456] */
@@ -4075,72 +4075,72 @@
   {
     /* [457] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [458] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[134],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [459] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [460] */
-    /* usage */ ParameterUsage::kSampleIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[10],
   },
   {
     /* [461] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [462] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[135],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [463] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[10],
   },
   {
     /* [464] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [465] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [466] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [467] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
   },
   {
     /* [468] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [469] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [470] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[83],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [471] */
@@ -4150,27 +4150,27 @@
   {
     /* [472] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [473] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[115],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [474] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [475] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [476] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [477] */
@@ -4225,7 +4225,7 @@
   {
     /* [487] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [488] */
@@ -4240,67 +4240,67 @@
   {
     /* [490] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [491] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[117],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [492] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [493] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[0],
   },
   {
     /* [494] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [495] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [496] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [497] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [498] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [499] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [500] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[91],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [501] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [502] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [503] */
@@ -4315,42 +4315,42 @@
   {
     /* [505] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [506] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [507] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[136],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [508] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[85],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [509] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[0],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [510] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [511] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[0],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [512] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [513] */
@@ -4404,28 +4404,28 @@
   },
   {
     /* [523] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[0],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[109],
   },
   {
     /* [524] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
-  },
-  {
-    /* [525] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
-  },
-  {
-    /* [526] */
     /* usage */ ParameterUsage::kLevel,
     /* matcher indices */ &kMatcherIndices[55],
   },
   {
+    /* [525] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [526] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
     /* [527] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[113],
   },
   {
     /* [528] */
@@ -4434,18 +4434,18 @@
   },
   {
     /* [529] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
   },
   {
     /* [530] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [531] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[115],
   },
   {
     /* [532] */
@@ -4454,18 +4454,18 @@
   },
   {
     /* [533] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[125],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
   },
   {
     /* [534] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [535] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[123],
+    /* matcher indices */ &kMatcherIndices[117],
   },
   {
     /* [536] */
@@ -4475,7 +4475,7 @@
   {
     /* [537] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[119],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [538] */
@@ -4485,7 +4485,7 @@
   {
     /* [539] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[111],
+    /* matcher indices */ &kMatcherIndices[121],
   },
   {
     /* [540] */
@@ -4494,68 +4494,68 @@
   },
   {
     /* [541] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[0],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [542] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
   },
   {
     /* [543] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [544] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [545] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [546] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [547] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[117],
-  },
-  {
-    /* [548] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[119],
-  },
-  {
-    /* [549] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[111],
-  },
-  {
-    /* [550] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[123],
   },
   {
-    /* [551] */
+    /* [544] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [545] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
+    /* [546] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[55],
+  },
+  {
+    /* [547] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [548] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
+  },
+  {
+    /* [549] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
+    /* [550] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[119],
+  },
+  {
+    /* [551] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [552] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[125],
+    /* matcher indices */ &kMatcherIndices[123],
   },
   {
     /* [553] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [554] */
@@ -4565,77 +4565,77 @@
   {
     /* [555] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
-  },
-  {
-    /* [556] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [557] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
-  },
-  {
-    /* [558] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [559] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [560] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [561] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
-  },
-  {
-    /* [562] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[43],
-  },
-  {
-    /* [563] */
-    /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[134],
   },
   {
-    /* [564] */
+    /* [556] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[36],
   },
   {
-    /* [565] */
+    /* [557] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[33],
   },
   {
-    /* [566] */
+    /* [558] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[27],
   },
   {
-    /* [567] */
+    /* [559] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[30],
   },
   {
-    /* [568] */
+    /* [560] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[136],
   },
   {
+    /* [561] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [562] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
+  },
+  {
+    /* [563] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[109],
+  },
+  {
+    /* [564] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [565] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [566] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [567] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [568] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
     /* [569] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [570] */
@@ -4650,7 +4650,7 @@
   {
     /* [572] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [573] */
@@ -4660,7 +4660,7 @@
   {
     /* [574] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [575] */
@@ -4669,13 +4669,13 @@
   },
   {
     /* [576] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[117],
   },
   {
     /* [577] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [578] */
@@ -4684,43 +4684,43 @@
   },
   {
     /* [579] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [580] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [581] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[115],
   },
   {
+    /* [580] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[123],
+  },
+  {
+    /* [581] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
     /* [582] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [583] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[27],
   },
   {
     /* [584] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[109],
   },
   {
     /* [585] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
   },
   {
     /* [586] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
   },
   {
     /* [587] */
@@ -4730,117 +4730,117 @@
   {
     /* [588] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[125],
+    /* matcher indices */ &kMatcherIndices[121],
   },
   {
     /* [589] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
+    /* matcher indices */ &kMatcherIndices[123],
   },
   {
     /* [590] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [591] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [592] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[111],
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [593] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[115],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [594] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[117],
+    /* matcher indices */ &kMatcherIndices[119],
   },
   {
     /* [595] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[119],
-  },
-  {
-    /* [596] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[123],
-  },
-  {
-    /* [597] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[125],
-  },
-  {
-    /* [598] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
-  },
-  {
-    /* [599] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[132],
-  },
-  {
-    /* [600] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [601] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[130],
-  },
-  {
-    /* [602] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [603] */
-    /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[134],
   },
   {
-    /* [604] */
+    /* [596] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [597] */
     /* usage */ ParameterUsage::kNone,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [605] */
+    /* [598] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [599] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [600] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [601] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [602] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [603] */
     /* usage */ ParameterUsage::kNone,
     /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [606] */
+    /* [604] */
     /* usage */ ParameterUsage::kNone,
     /* matcher indices */ &kMatcherIndices[1],
   },
   {
-    /* [607] */
+    /* [605] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [608] */
+    /* [606] */
     /* usage */ ParameterUsage::kNone,
     /* matcher indices */ &kMatcherIndices[12],
   },
   {
+    /* [607] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[83],
+  },
+  {
+    /* [608] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[83],
+  },
+  {
     /* [609] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[87],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [610] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[87],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [611] */
@@ -4850,22 +4850,22 @@
   {
     /* [612] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [613] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [614] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [615] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [616] */
@@ -4875,7 +4875,7 @@
   {
     /* [617] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [618] */
@@ -4885,7 +4885,7 @@
   {
     /* [619] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [620] */
@@ -4895,7 +4895,7 @@
   {
     /* [621] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [622] */
@@ -4905,7 +4905,7 @@
   {
     /* [623] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [624] */
@@ -4915,7 +4915,7 @@
   {
     /* [625] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [626] */
@@ -4925,7 +4925,7 @@
   {
     /* [627] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [628] */
@@ -4935,7 +4935,7 @@
   {
     /* [629] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [630] */
@@ -4945,7 +4945,7 @@
   {
     /* [631] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [632] */
@@ -4955,122 +4955,122 @@
   {
     /* [633] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [634] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [635] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [636] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [637] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [638] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [639] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [640] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [641] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [642] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [643] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [644] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [645] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [646] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [647] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [648] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [649] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [650] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [651] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [652] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [653] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [654] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [655] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[17],
   },
   {
     /* [656] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [657] */
@@ -5080,47 +5080,47 @@
   {
     /* [658] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [659] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [660] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [661] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [662] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [663] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [664] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [665] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[17],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [666] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [667] */
@@ -5130,42 +5130,42 @@
   {
     /* [668] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [669] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [670] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [671] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [672] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[39],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [673] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [674] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[4],
   },
   {
     /* [675] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[0],
   },
   {
     /* [676] */
@@ -5175,7 +5175,7 @@
   {
     /* [677] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[10],
   },
   {
     /* [678] */
@@ -5185,12 +5185,12 @@
   {
     /* [679] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
+    /* matcher indices */ &kMatcherIndices[10],
   },
   {
     /* [680] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [681] */
@@ -5200,52 +5200,12 @@
   {
     /* [682] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [683] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[0],
-  },
-  {
-    /* [684] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[12],
-  },
-  {
-    /* [685] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[4],
-  },
-  {
-    /* [686] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[21],
-  },
-  {
-    /* [687] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[10],
-  },
-  {
-    /* [688] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[21],
-  },
-  {
-    /* [689] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[10],
-  },
-  {
-    /* [690] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [691] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[1],
   },
 };
 
@@ -5313,7 +5273,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[549],
+    /* parameters */ &kParameters[563],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5325,7 +5285,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[539],
+    /* parameters */ &kParameters[523],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5337,7 +5297,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[581],
+    /* parameters */ &kParameters[562],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5349,7 +5309,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[473],
+    /* parameters */ &kParameters[527],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5361,7 +5321,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[547],
+    /* parameters */ &kParameters[561],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5373,7 +5333,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[491],
+    /* parameters */ &kParameters[531],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5385,8 +5345,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[548],
-    /* return matcher indices */ &kMatcherIndices[99],
+    /* parameters */ &kParameters[576],
+    /* return matcher indices */ &kMatcherIndices[97],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5397,8 +5357,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[537],
-    /* return matcher indices */ &kMatcherIndices[99],
+    /* parameters */ &kParameters[535],
+    /* return matcher indices */ &kMatcherIndices[97],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5409,7 +5369,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[550],
+    /* parameters */ &kParameters[554],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5421,7 +5381,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[535],
+    /* parameters */ &kParameters[539],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5445,7 +5405,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[533],
+    /* parameters */ &kParameters[543],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5457,7 +5417,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[554],
+    /* parameters */ &kParameters[550],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5469,7 +5429,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[555],
+    /* parameters */ &kParameters[548],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5481,7 +5441,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[531],
+    /* parameters */ &kParameters[497],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5493,7 +5453,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[557],
+    /* parameters */ &kParameters[549],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5505,7 +5465,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[529],
+    /* parameters */ &kParameters[545],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5517,7 +5477,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[559],
+    /* parameters */ &kParameters[551],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5529,7 +5489,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[527],
+    /* parameters */ &kParameters[541],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5541,7 +5501,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[561],
+    /* parameters */ &kParameters[553],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5553,7 +5513,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[525],
+    /* parameters */ &kParameters[537],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5565,7 +5525,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[563],
+    /* parameters */ &kParameters[555],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5577,7 +5537,7 @@
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[564],
+    /* parameters */ &kParameters[556],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5589,7 +5549,7 @@
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[565],
+    /* parameters */ &kParameters[557],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5601,7 +5561,7 @@
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[566],
+    /* parameters */ &kParameters[558],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5613,8 +5573,8 @@
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[567],
-    /* return matcher indices */ &kMatcherIndices[99],
+    /* parameters */ &kParameters[559],
+    /* return matcher indices */ &kMatcherIndices[97],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5625,7 +5585,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[568],
+    /* parameters */ &kParameters[560],
     /* return matcher indices */ &kMatcherIndices[85],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5637,8 +5597,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[270],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[258],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5649,8 +5609,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[73],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[163],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5661,8 +5621,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[118],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[168],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5673,8 +5633,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[43],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[13],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5685,8 +5645,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[254],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[242],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5697,8 +5657,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[138],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[183],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5709,8 +5669,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[246],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[234],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5721,8 +5681,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[143],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[188],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5733,7 +5693,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[238],
+    /* parameters */ &kParameters[226],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5745,7 +5705,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[178],
+    /* parameters */ &kParameters[198],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5757,7 +5717,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[213],
+    /* parameters */ &kParameters[208],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5769,7 +5729,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[19],
+    /* parameters */ &kParameters[37],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5781,7 +5741,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[334],
+    /* parameters */ &kParameters[218],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5793,7 +5753,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[113],
+    /* parameters */ &kParameters[108],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -5806,7 +5766,7 @@
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[362],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5817,8 +5777,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[455],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[392],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5829,8 +5789,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[470],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[428],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5841,8 +5801,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[310],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[286],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5853,8 +5813,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[314],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[306],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5865,8 +5825,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[103],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[83],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5877,8 +5837,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[449],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[470],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5889,8 +5849,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[294],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[322],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5901,8 +5861,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[443],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[449],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5913,8 +5873,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[290],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[310],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -5937,7 +5897,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[282],
+    /* parameters */ &kParameters[294],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -5949,7 +5909,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[274],
+    /* parameters */ &kParameters[282],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -5961,7 +5921,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[123],
+    /* parameters */ &kParameters[73],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -5973,7 +5933,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[404],
+    /* parameters */ &kParameters[419],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -5985,7 +5945,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[242],
+    /* parameters */ &kParameters[278],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -5997,8 +5957,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[322],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[330],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6009,8 +5969,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[188],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[128],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6021,8 +5981,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[158],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[123],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6033,8 +5993,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[61],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[31],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6045,8 +6005,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[318],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[326],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6057,8 +6017,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[133],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[103],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6069,8 +6029,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[461],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[455],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6081,8 +6041,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[218],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[302],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6093,8 +6053,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[302],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[342],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6105,8 +6065,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[83],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[158],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6117,8 +6077,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[371],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[368],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6129,8 +6089,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[230],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[238],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6153,7 +6113,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[368],
+    /* parameters */ &kParameters[371],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6165,7 +6125,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[286],
+    /* parameters */ &kParameters[250],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6177,7 +6137,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[377],
+    /* parameters */ &kParameters[374],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6189,7 +6149,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[383],
+    /* parameters */ &kParameters[377],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6201,7 +6161,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[386],
+    /* parameters */ &kParameters[383],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6213,7 +6173,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[342],
+    /* parameters */ &kParameters[262],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6225,7 +6185,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[395],
+    /* parameters */ &kParameters[404],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6237,7 +6197,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[401],
+    /* parameters */ &kParameters[410],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6249,7 +6209,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[350],
+    /* parameters */ &kParameters[413],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6261,7 +6221,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[258],
+    /* parameters */ &kParameters[274],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6273,7 +6233,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[422],
+    /* parameters */ &kParameters[416],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6285,7 +6245,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[592],
+    /* parameters */ &kParameters[584],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6297,7 +6257,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[593],
+    /* parameters */ &kParameters[585],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6309,7 +6269,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[594],
+    /* parameters */ &kParameters[586],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6321,7 +6281,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[595],
+    /* parameters */ &kParameters[587],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6333,7 +6293,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[596],
+    /* parameters */ &kParameters[588],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6345,7 +6305,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[597],
+    /* parameters */ &kParameters[589],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6357,7 +6317,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[598],
+    /* parameters */ &kParameters[590],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6369,7 +6329,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[599],
+    /* parameters */ &kParameters[591],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6381,7 +6341,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[600],
+    /* parameters */ &kParameters[592],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6393,7 +6353,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[601],
+    /* parameters */ &kParameters[593],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6405,8 +6365,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[428],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[422],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6417,8 +6377,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[431],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[467],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6429,8 +6389,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[278],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[290],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6442,7 +6402,7 @@
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[434],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6453,8 +6413,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[446],
-    /* return matcher indices */ &kMatcherIndices[113],
+    /* parameters */ &kParameters[440],
+    /* return matcher indices */ &kMatcherIndices[111],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6465,7 +6425,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[452],
+    /* parameters */ &kParameters[446],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6477,7 +6437,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[306],
+    /* parameters */ &kParameters[314],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6489,7 +6449,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[458],
+    /* parameters */ &kParameters[452],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6501,201 +6461,201 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[507],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[511],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [100] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[198],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [101] */
-    /* num parameters */ 6,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[37],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [102] */
-    /* num parameters */ 6,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[49],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [103] */
-    /* num parameters */ 7,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[0],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [104] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[93],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [105] */
-    /* num parameters */ 6,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[7],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [106] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[98],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [107] */
-    /* num parameters */ 6,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[67],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [108] */
     /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[326],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[270],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [109] */
+    /* [101] */
     /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[148],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[133],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [110] */
+    /* [102] */
     /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[153],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[178],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [111] */
+    /* [103] */
     /* num parameters */ 6,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[31],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[19],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [112] */
+    /* [104] */
     /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[346],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [113] */
+    /* [105] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[153],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [106] */
+    /* num parameters */ 4,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[254],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [107] */
     /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[173],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [114] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[234],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [115] */
+    /* [108] */
     /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[183],
-    /* return matcher indices */ &kMatcherIndices[87],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[88],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [109] */
+    /* num parameters */ 6,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[7],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [110] */
+    /* num parameters */ 6,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[67],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [111] */
+    /* num parameters */ 7,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[0],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [112] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[98],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [113] */
+    /* num parameters */ 6,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[43],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [114] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[118],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [115] */
+    /* num parameters */ 6,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[61],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6705,8 +6665,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[262],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[230],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6717,8 +6677,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[193],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[203],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6729,8 +6689,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[168],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[143],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6741,8 +6701,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[25],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[49],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6753,8 +6713,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[250],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[222],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6765,8 +6725,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[88],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[148],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6777,9 +6737,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[298],
+    /* parameters */ &kParameters[246],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6789,9 +6749,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[128],
+    /* parameters */ &kParameters[193],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6801,9 +6761,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[78],
+    /* parameters */ &kParameters[213],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6813,9 +6773,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[13],
+    /* parameters */ &kParameters[25],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6825,9 +6785,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[330],
+    /* parameters */ &kParameters[338],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6837,9 +6797,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[203],
+    /* parameters */ &kParameters[78],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6849,9 +6809,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[222],
+    /* parameters */ &kParameters[334],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6861,9 +6821,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[208],
+    /* parameters */ &kParameters[138],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6873,9 +6833,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[163],
+    /* parameters */ &kParameters[113],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6887,7 +6847,7 @@
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[55],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6897,9 +6857,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[266],
+    /* parameters */ &kParameters[318],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6909,9 +6869,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[108],
+    /* parameters */ &kParameters[93],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6921,7 +6881,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[587],
+    /* parameters */ &kParameters[579],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6933,7 +6893,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[588],
+    /* parameters */ &kParameters[580],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6945,7 +6905,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[589],
+    /* parameters */ &kParameters[581],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6957,7 +6917,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[590],
+    /* parameters */ &kParameters[582],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6969,7 +6929,7 @@
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[591],
+    /* parameters */ &kParameters[583],
     /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -6977,72 +6937,72 @@
   {
     /* [139] */
     /* num parameters */ 3,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[3],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[419],
-    /* return matcher indices */ &kMatcherIndices[12],
+    /* parameters */ &kParameters[458],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [140] */
     /* num parameters */ 3,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[3],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[380],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[461],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [141] */
     /* num parameters */ 3,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[3],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[425],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[380],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [142] */
     /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[3],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[416],
-    /* return matcher indices */ &kMatcherIndices[1],
+    /* parameters */ &kParameters[395],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [143] */
     /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[3],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[413],
-    /* return matcher indices */ &kMatcherIndices[39],
+    /* parameters */ &kParameters[398],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [144] */
     /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[3],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[410],
-    /* return matcher indices */ &kMatcherIndices[39],
+    /* parameters */ &kParameters[401],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7053,9 +7013,9 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[637],
+    /* parameters */ &kParameters[570],
     /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7065,9 +7025,9 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[636],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[569],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7077,7 +7037,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[667],
+    /* parameters */ &kParameters[657],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7089,8 +7049,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[666],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[656],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7101,7 +7061,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[669],
+    /* parameters */ &kParameters[659],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7113,7 +7073,7 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[668],
+    /* parameters */ &kParameters[658],
     /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7125,7 +7085,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[497],
+    /* parameters */ &kParameters[503],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7137,7 +7097,7 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[495],
+    /* parameters */ &kParameters[501],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7149,7 +7109,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[671],
+    /* parameters */ &kParameters[661],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7161,7 +7121,7 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[670],
+    /* parameters */ &kParameters[660],
     /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7173,7 +7133,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[664],
+    /* parameters */ &kParameters[654],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -7185,8 +7145,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[691],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[653],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -7197,7 +7157,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[663],
+    /* parameters */ &kParameters[652],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -7209,8 +7169,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[662],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[651],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -7221,7 +7181,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[661],
+    /* parameters */ &kParameters[650],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -7233,8 +7193,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[660],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[649],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -7245,7 +7205,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[659],
+    /* parameters */ &kParameters[648],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -7257,8 +7217,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[658],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[647],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -7269,7 +7229,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[657],
+    /* parameters */ &kParameters[646],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -7281,8 +7241,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[656],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[645],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -7293,7 +7253,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[655],
+    /* parameters */ &kParameters[644],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
@@ -7305,8 +7265,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[654],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[643],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
@@ -7317,7 +7277,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[653],
+    /* parameters */ &kParameters[642],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7329,8 +7289,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[652],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[641],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7341,7 +7301,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[651],
+    /* parameters */ &kParameters[640],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7353,8 +7313,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[650],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[639],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7389,7 +7349,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[673],
+    /* parameters */ &kParameters[663],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7401,7 +7361,7 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[672],
+    /* parameters */ &kParameters[662],
     /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7413,7 +7373,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[649],
+    /* parameters */ &kParameters[638],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7425,7 +7385,7 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[648],
+    /* parameters */ &kParameters[637],
     /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7437,7 +7397,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[647],
+    /* parameters */ &kParameters[636],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7449,7 +7409,7 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[646],
+    /* parameters */ &kParameters[635],
     /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7461,7 +7421,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[645],
+    /* parameters */ &kParameters[634],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7473,8 +7433,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[644],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[633],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7498,7 +7458,7 @@
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[464],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7509,205 +7469,61 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[643],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [184] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[642],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [185] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[641],
-    /* return matcher indices */ &kMatcherIndices[138],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [186] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[640],
-    /* return matcher indices */ &kMatcherIndices[101],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [187] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[639],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [188] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[638],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [189] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[675],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [190] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[674],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [191] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[635],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [192] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[634],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [193] */
-    /* num parameters */ 4,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[0],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[338],
-    /* return matcher indices */ &kMatcherIndices[1],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [194] */
-    /* num parameters */ 4,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[0],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[226],
-    /* return matcher indices */ &kMatcherIndices[39],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [195] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[632],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [196] */
+    /* [184] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[631],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [197] */
+    /* [185] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[630],
-    /* return matcher indices */ &kMatcherIndices[10],
+    /* return matcher indices */ &kMatcherIndices[138],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
-    /* [198] */
+    /* [186] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[629],
-    /* return matcher indices */ &kMatcherIndices[21],
+    /* return matcher indices */ &kMatcherIndices[101],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
-    /* [199] */
+    /* [187] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[628],
-    /* return matcher indices */ &kMatcherIndices[10],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
-    /* [200] */
+    /* [188] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
@@ -7715,23 +7531,23 @@
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[627],
     /* return matcher indices */ &kMatcherIndices[21],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
-    /* [201] */
+    /* [189] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[626],
-    /* return matcher indices */ &kMatcherIndices[10],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
-    /* [202] */
+    /* [190] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
@@ -7739,23 +7555,23 @@
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[625],
     /* return matcher indices */ &kMatcherIndices[21],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
-    /* [203] */
+    /* [191] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[624],
-    /* return matcher indices */ &kMatcherIndices[10],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
-    /* [204] */
+    /* [192] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
@@ -7763,35 +7579,35 @@
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[623],
     /* return matcher indices */ &kMatcherIndices[21],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
-    /* [205] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
+    /* [193] */
+    /* num parameters */ 4,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[489],
-    /* return matcher indices */ &kMatcherIndices[12],
+    /* parameters */ &kParameters[266],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [206] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
+    /* [194] */
+    /* num parameters */ 4,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[487],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[298],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [207] */
+    /* [195] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -7803,19 +7619,43 @@
     /* is_deprecated */ false,
   },
   {
-    /* [208] */
+    /* [196] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[621],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [197] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[495],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [209] */
+    /* [198] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[487],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [199] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -7827,19 +7667,19 @@
     /* is_deprecated */ false,
   },
   {
-    /* [210] */
+    /* [200] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[619],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [211] */
+    /* [201] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -7851,19 +7691,43 @@
     /* is_deprecated */ false,
   },
   {
-    /* [212] */
+    /* [202] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[617],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [213] */
+    /* [203] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[616],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [204] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[615],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [205] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 0,
@@ -7875,7 +7739,7 @@
     /* is_deprecated */ false,
   },
   {
-    /* [214] */
+    /* [206] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
@@ -7887,7 +7751,7 @@
     /* is_deprecated */ false,
   },
   {
-    /* [215] */
+    /* [207] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 0,
@@ -7899,7 +7763,7 @@
     /* is_deprecated */ false,
   },
   {
-    /* [216] */
+    /* [208] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
@@ -7911,13 +7775,109 @@
     /* is_deprecated */ false,
   },
   {
+    /* [209] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[665],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [210] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[664],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [211] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[614],
+    /* return matcher indices */ &kMatcherIndices[137],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [212] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[613],
+    /* return matcher indices */ &kMatcherIndices[103],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [213] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[667],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [214] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[666],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [215] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[431],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [216] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[425],
+    /* return matcher indices */ &kMatcherIndices[39],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
     /* [217] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[677],
+    /* parameters */ &kParameters[669],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -7929,56 +7889,56 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[676],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[668],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [219] */
-    /* num parameters */ 1,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[616],
-    /* return matcher indices */ &kMatcherIndices[137],
+    /* parameters */ &kParameters[389],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [220] */
-    /* num parameters */ 1,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[615],
-    /* return matcher indices */ &kMatcherIndices[103],
+    /* parameters */ &kParameters[386],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [221] */
-    /* num parameters */ 3,
+    /* num parameters */ 1,
     /* num open types */ 1,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[440],
-    /* return matcher indices */ &kMatcherIndices[1],
+    /* parameters */ &kParameters[594],
+    /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [222] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[467],
-    /* return matcher indices */ &kMatcherIndices[39],
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[595],
+    /* return matcher indices */ &kMatcherIndices[55],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7989,121 +7949,25 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[583],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [224] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[582],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [225] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[679],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [226] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[678],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [227] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[573],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [228] */
+    /* [224] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[572],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [229] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[602],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [230] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[603],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [231] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[503],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [232] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[501],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [233] */
+    /* [225] */
     /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -8115,14 +7979,110 @@
     /* is_deprecated */ false,
   },
   {
-    /* [234] */
+    /* [226] */
     /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[475],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [227] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[606],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [228] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[605],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [229] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[473],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [230] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[507],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [231] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[671],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [232] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[670],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [233] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[0],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[604],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [234] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[0],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[603],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8133,7 +8093,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[608],
+    /* parameters */ &kParameters[602],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -8145,8 +8105,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[607],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[547],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8157,7 +8117,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[681],
+    /* parameters */ &kParameters[673],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -8169,8 +8129,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[680],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[672],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8181,8 +8141,8 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[684],
-    /* return matcher indices */ &kMatcherIndices[12],
+    /* parameters */ &kParameters[677],
+    /* return matcher indices */ &kMatcherIndices[10],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8193,32 +8153,32 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[682],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[676],
+    /* return matcher indices */ &kMatcherIndices[10],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [241] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[0],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[606],
-    /* return matcher indices */ &kMatcherIndices[1],
+    /* parameters */ &kParameters[599],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [242] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[0],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[605],
-    /* return matcher indices */ &kMatcherIndices[39],
+    /* parameters */ &kParameters[598],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8229,7 +8189,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[604],
+    /* parameters */ &kParameters[597],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -8241,8 +8201,8 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[586],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[596],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8253,7 +8213,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[687],
+    /* parameters */ &kParameters[679],
     /* return matcher indices */ &kMatcherIndices[10],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -8265,7 +8225,7 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[686],
+    /* parameters */ &kParameters[678],
     /* return matcher indices */ &kMatcherIndices[10],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -8277,7 +8237,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[585],
+    /* parameters */ &kParameters[578],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -8289,32 +8249,32 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[584],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[577],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [249] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[689],
-    /* return matcher indices */ &kMatcherIndices[10],
+    /* parameters */ &kParameters[489],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [250] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[688],
-    /* return matcher indices */ &kMatcherIndices[10],
+    /* parameters */ &kParameters[491],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8325,7 +8285,7 @@
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[580],
+    /* parameters */ &kParameters[681],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
@@ -8337,109 +8297,13 @@
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[579],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[680],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [253] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[374],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [254] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[389],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [255] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[578],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [256] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[577],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [257] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[505],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [258] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[543],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [259] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[576],
-    /* return matcher indices */ &kMatcherIndices[12],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [260] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[690],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [261] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -8451,67 +8315,67 @@
     /* is_deprecated */ false,
   },
   {
-    /* [262] */
+    /* [254] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[574],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [263] */
+    /* [255] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[570],
+    /* parameters */ &kParameters[601],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [264] */
+    /* [256] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[569],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[600],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [265] */
+    /* [257] */
     /* num parameters */ 1,
     /* num open types */ 1,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[633],
+    /* parameters */ &kParameters[683],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [266] */
+    /* [258] */
     /* num parameters */ 1,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[551],
+    /* parameters */ &kParameters[682],
     /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [267] */
+    /* [259] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 2,
@@ -8523,127 +8387,91 @@
     /* is_deprecated */ false,
   },
   {
-    /* [268] */
+    /* [260] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[562],
+    /* parameters */ &kParameters[568],
     /* return matcher indices */ &kMatcherIndices[81],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [269] */
+    /* [261] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[560],
+    /* parameters */ &kParameters[567],
     /* return matcher indices */ &kMatcherIndices[81],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [270] */
+    /* [262] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[558],
+    /* parameters */ &kParameters[566],
     /* return matcher indices */ &kMatcherIndices[81],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [271] */
+    /* [263] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[556],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[565],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [272] */
+    /* [264] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[553],
-    /* return matcher indices */ &kMatcherIndices[87],
+    /* parameters */ &kParameters[564],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [273] */
+    /* [265] */
     /* num parameters */ 0,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[692],
+    /* parameters */ &kParameters[684],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [274] */
+    /* [266] */
     /* num parameters */ 0,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[692],
+    /* parameters */ &kParameters[684],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [275] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[613],
-    /* return matcher indices */ &kMatcherIndices[43],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [276] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[392],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [277] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[545],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [278] */
+    /* [267] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -8655,7 +8483,55 @@
     /* is_deprecated */ false,
   },
   {
-    /* [279] */
+    /* [268] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[443],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [269] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[509],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [270] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[607],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [271] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[608],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [272] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -8667,7 +8543,7 @@
     /* is_deprecated */ false,
   },
   {
-    /* [280] */
+    /* [273] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -8679,139 +8555,103 @@
     /* is_deprecated */ false,
   },
   {
-    /* [281] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[612],
-    /* return matcher indices */ &kMatcherIndices[43],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [282] */
+    /* [274] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[614],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[612],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [283] */
+    /* [275] */
     /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
     /* parameters */ &kParameters[353],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [284] */
+    /* [276] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[493],
+    /* parameters */ &kParameters[499],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [285] */
+    /* [277] */
     /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[665],
+    /* parameters */ &kParameters[655],
     /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [286] */
+    /* [278] */
     /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[499],
+    /* parameters */ &kParameters[505],
     /* return matcher indices */ &kMatcherIndices[91],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [287] */
+    /* [279] */
     /* num parameters */ 1,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[2],
     /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[685],
+    /* parameters */ &kParameters[674],
     /* return matcher indices */ &kMatcherIndices[43],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [288] */
+    /* [280] */
     /* num parameters */ 1,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[683],
+    /* parameters */ &kParameters[675],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [289] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[0],
-    /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[509],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [290] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[0],
-    /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[511],
-    /* return matcher indices */ &kMatcherIndices[1],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [291] */
+    /* [281] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[5],
     /* parameters */ &kParameters[513],
-    /* return matcher indices */ &kMatcherIndices[1],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [292] */
+    /* [282] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
@@ -8823,7 +8663,7 @@
     /* is_deprecated */ false,
   },
   {
-    /* [293] */
+    /* [283] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
@@ -8835,19 +8675,7 @@
     /* is_deprecated */ false,
   },
   {
-    /* [294] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[0],
-    /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[519],
-    /* return matcher indices */ &kMatcherIndices[1],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [295] */
+    /* [284] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
@@ -8859,38 +8687,74 @@
     /* is_deprecated */ false,
   },
   {
-    /* [296] */
+    /* [285] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[523],
+    /* parameters */ &kParameters[525],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [297] */
+    /* [286] */
     /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[541],
+    /* parameters */ &kParameters[529],
     /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [298] */
+    /* [287] */
+    /* num parameters */ 2,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[0],
+    /* open numbers */ &kOpenNumbers[5],
+    /* parameters */ &kParameters[533],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [288] */
+    /* num parameters */ 2,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[0],
+    /* open numbers */ &kOpenNumbers[5],
+    /* parameters */ &kParameters[519],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [289] */
+    /* num parameters */ 2,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[0],
+    /* open numbers */ &kOpenNumbers[5],
+    /* parameters */ &kParameters[493],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [290] */
     /* num parameters */ 3,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[0],
     /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[398],
-    /* return matcher indices */ &kMatcherIndices[105],
+    /* parameters */ &kParameters[350],
+    /* return matcher indices */ &kMatcherIndices[127],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8902,83 +8766,83 @@
     /* fn abs<T : fiu32>(T) -> T */
     /* fn abs<N : num, T : fiu32>(vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[265],
+    /* overloads */ &kOverloads[257],
   },
   {
     /* [1] */
     /* fn acos(f32) -> f32 */
     /* fn acos<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[259],
+    /* overloads */ &kOverloads[251],
   },
   {
     /* [2] */
     /* fn all(bool) -> bool */
     /* fn all<N : num>(vec<N, bool>) -> bool */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[249],
+    /* overloads */ &kOverloads[245],
   },
   {
     /* [3] */
     /* fn any(bool) -> bool */
     /* fn any<N : num>(vec<N, bool>) -> bool */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[245],
+    /* overloads */ &kOverloads[239],
   },
   {
     /* [4] */
     /* fn arrayLength<T, A : access>(ptr<storage, array<T>, A>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[287],
+    /* overloads */ &kOverloads[279],
   },
   {
     /* [5] */
     /* fn asin(f32) -> f32 */
     /* fn asin<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[239],
+    /* overloads */ &kOverloads[237],
   },
   {
     /* [6] */
     /* fn atan(f32) -> f32 */
     /* fn atan<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[237],
+    /* overloads */ &kOverloads[231],
   },
   {
     /* [7] */
     /* fn atan2(f32, f32) -> f32 */
     /* fn atan2<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[231],
+    /* overloads */ &kOverloads[229],
   },
   {
     /* [8] */
     /* fn ceil(f32) -> f32 */
     /* fn ceil<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[225],
+    /* overloads */ &kOverloads[217],
   },
   {
     /* [9] */
     /* fn clamp<T : fiu32>(T, T, T) -> T */
     /* fn clamp<N : num, T : fiu32>(vec<N, T>, vec<N, T>, vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[221],
+    /* overloads */ &kOverloads[215],
   },
   {
     /* [10] */
     /* fn cos(f32) -> f32 */
     /* fn cos<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[217],
+    /* overloads */ &kOverloads[213],
   },
   {
     /* [11] */
     /* fn cosh(f32) -> f32 */
     /* fn cosh<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[189],
+    /* overloads */ &kOverloads[209],
   },
   {
     /* [12] */
@@ -9005,7 +8869,7 @@
     /* [15] */
     /* fn cross(vec3<f32>, vec3<f32>) -> vec3<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[286],
+    /* overloads */ &kOverloads[278],
   },
   {
     /* [16] */
@@ -9018,7 +8882,7 @@
     /* [17] */
     /* fn determinant<N : num>(mat<N, N, f32>) -> f32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[285],
+    /* overloads */ &kOverloads[277],
   },
   {
     /* [18] */
@@ -9031,7 +8895,7 @@
     /* [19] */
     /* fn dot<N : num, T : fiu32>(vec<N, T>, vec<N, T>) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[284],
+    /* overloads */ &kOverloads[276],
   },
   {
     /* [20] */
@@ -9100,7 +8964,7 @@
     /* [29] */
     /* fn faceForward<N : num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[283],
+    /* overloads */ &kOverloads[275],
   },
   {
     /* [30] */
@@ -9156,7 +9020,7 @@
     /* fn fwidthCoarse(f32) -> f32 */
     /* fn fwidthCoarse<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[145],
+    /* overloads */ &kOverloads[189],
   },
   {
     /* [38] */
@@ -9181,286 +9045,258 @@
   },
   {
     /* [41] */
-    /* fn isFinite(f32) -> bool */
-    /* fn isFinite<N : num>(vec<N, f32>) -> vec<N, bool> */
+    /* fn ldexp(f32, i32) -> f32 */
+    /* fn ldexp<N : num>(vec<N, f32>, vec<N, i32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[197],
   },
   {
     /* [42] */
-    /* fn isInf(f32) -> bool */
-    /* fn isInf<N : num>(vec<N, f32>) -> vec<N, bool> */
+    /* fn length(f32) -> f32 */
+    /* fn length<N : num>(vec<N, f32>) -> f32 */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[199],
   },
   {
     /* [43] */
-    /* fn isNan(f32) -> bool */
-    /* fn isNan<N : num>(vec<N, f32>) -> vec<N, bool> */
+    /* fn log(f32) -> f32 */
+    /* fn log<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[201],
   },
   {
     /* [44] */
-    /* fn isNormal(f32) -> bool */
-    /* fn isNormal<N : num>(vec<N, f32>) -> vec<N, bool> */
+    /* fn log2(f32) -> f32 */
+    /* fn log2<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[203],
   },
   {
     /* [45] */
-    /* fn ldexp(f32, i32) -> f32 */
-    /* fn ldexp<N : num>(vec<N, f32>, vec<N, i32>) -> vec<N, f32> */
+    /* fn max<T : fiu32>(T, T) -> T */
+    /* fn max<N : num, T : fiu32>(vec<N, T>, vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[205],
   },
   {
     /* [46] */
-    /* fn length(f32) -> f32 */
-    /* fn length<N : num>(vec<N, f32>) -> f32 */
+    /* fn min<T : fiu32>(T, T) -> T */
+    /* fn min<N : num, T : fiu32>(vec<N, T>, vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[207],
   },
   {
     /* [47] */
-    /* fn log(f32) -> f32 */
-    /* fn log<N : num>(vec<N, f32>) -> vec<N, f32> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[209],
+    /* fn mix(f32, f32, f32) -> f32 */
+    /* fn mix<N : num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
+    /* fn mix<N : num>(vec<N, f32>, vec<N, f32>, f32) -> vec<N, f32> */
+    /* num overloads */ 3,
+    /* overloads */ &kOverloads[142],
   },
   {
     /* [48] */
-    /* fn log2(f32) -> f32 */
-    /* fn log2<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* fn modf(f32) -> __modf_result */
+    /* fn modf<N : num>(vec<N, f32>) -> __modf_result_vec<N> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[211],
   },
   {
     /* [49] */
-    /* fn max<T : fiu32>(T, T) -> T */
-    /* fn max<N : num, T : fiu32>(vec<N, T>, vec<N, T>) -> vec<N, T> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[213],
+    /* fn normalize<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[274],
   },
   {
     /* [50] */
-    /* fn min<T : fiu32>(T, T) -> T */
-    /* fn min<N : num, T : fiu32>(vec<N, T>, vec<N, T>) -> vec<N, T> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[215],
+    /* fn pack2x16float(vec2<f32>) -> u32 */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[273],
   },
   {
     /* [51] */
-    /* fn mix(f32, f32, f32) -> f32 */
-    /* fn mix<N : num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
-    /* fn mix<N : num>(vec<N, f32>, vec<N, f32>, f32) -> vec<N, f32> */
-    /* num overloads */ 3,
-    /* overloads */ &kOverloads[139],
+    /* fn pack2x16snorm(vec2<f32>) -> u32 */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[272],
   },
   {
     /* [52] */
-    /* fn modf(f32) -> __modf_result */
-    /* fn modf<N : num>(vec<N, f32>) -> __modf_result_vec<N> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[219],
+    /* fn pack2x16unorm(vec2<f32>) -> u32 */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[267],
   },
   {
     /* [53] */
-    /* fn normalize<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* fn pack4x8snorm(vec4<f32>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[282],
+    /* overloads */ &kOverloads[271],
   },
   {
     /* [54] */
-    /* fn pack2x16float(vec2<f32>) -> u32 */
+    /* fn pack4x8unorm(vec4<f32>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[275],
+    /* overloads */ &kOverloads[270],
   },
   {
     /* [55] */
-    /* fn pack2x16snorm(vec2<f32>) -> u32 */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[281],
+    /* fn pow(f32, f32) -> f32 */
+    /* fn pow<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
+    /* num overloads */ 2,
+    /* overloads */ &kOverloads[225],
   },
   {
     /* [56] */
-    /* fn pack2x16unorm(vec2<f32>) -> u32 */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[280],
+    /* fn radians(f32) -> f32 */
+    /* fn radians<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* num overloads */ 2,
+    /* overloads */ &kOverloads[227],
   },
   {
     /* [57] */
-    /* fn pack4x8snorm(vec4<f32>) -> u32 */
+    /* fn reflect<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[279],
+    /* overloads */ &kOverloads[269],
   },
   {
     /* [58] */
-    /* fn pack4x8unorm(vec4<f32>) -> u32 */
+    /* fn refract<N : num>(vec<N, f32>, vec<N, f32>, f32) -> vec<N, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[278],
+    /* overloads */ &kOverloads[268],
   },
   {
     /* [59] */
-    /* fn pow(f32, f32) -> f32 */
-    /* fn pow<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
+    /* fn reverseBits<T : iu32>(T) -> T */
+    /* fn reverseBits<N : num, T : iu32>(vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[233],
   },
   {
     /* [60] */
-    /* fn radians(f32) -> f32 */
-    /* fn radians<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* fn round(f32) -> f32 */
+    /* fn round<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[235],
   },
   {
     /* [61] */
-    /* fn reflect<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[277],
+    /* fn select<T : scalar>(T, T, bool) -> T */
+    /* fn select<T : scalar, N : num>(vec<N, T>, vec<N, T>, bool) -> vec<N, T> */
+    /* fn select<N : num, T : scalar>(vec<N, T>, vec<N, T>, vec<N, bool>) -> vec<N, T> */
+    /* num overloads */ 3,
+    /* overloads */ &kOverloads[139],
   },
   {
     /* [62] */
-    /* fn refract<N : num>(vec<N, f32>, vec<N, f32>, f32) -> vec<N, f32> */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[276],
+    /* fn sign(f32) -> f32 */
+    /* fn sign<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* num overloads */ 2,
+    /* overloads */ &kOverloads[255],
   },
   {
     /* [63] */
-    /* fn reverseBits<T : iu32>(T) -> T */
-    /* fn reverseBits<N : num, T : iu32>(vec<N, T>) -> vec<N, T> */
+    /* fn sin(f32) -> f32 */
+    /* fn sin<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[241],
   },
   {
     /* [64] */
-    /* fn round(f32) -> f32 */
-    /* fn round<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* fn sinh(f32) -> f32 */
+    /* fn sinh<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[243],
   },
   {
     /* [65] */
-    /* fn select<T : scalar>(T, T, bool) -> T */
-    /* fn select<T : scalar, N : num>(vec<N, T>, vec<N, T>, bool) -> vec<N, T> */
-    /* fn select<N : num, T : scalar>(vec<N, T>, vec<N, T>, vec<N, bool>) -> vec<N, T> */
-    /* num overloads */ 3,
-    /* overloads */ &kOverloads[142],
+    /* fn smoothStep(f32, f32, f32) -> f32 */
+    /* fn smoothStep<N : num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
+    /* num overloads */ 2,
+    /* overloads */ &kOverloads[219],
   },
   {
     /* [66] */
-    /* fn sign(f32) -> f32 */
-    /* fn sign<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* fn sqrt(f32) -> f32 */
+    /* fn sqrt<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[247],
   },
   {
     /* [67] */
-    /* fn sin(f32) -> f32 */
-    /* fn sin<N : num>(vec<N, f32>) -> vec<N, f32> */
+    /* fn step(f32, f32) -> f32 */
+    /* fn step<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[223],
+    /* overloads */ &kOverloads[249],
   },
   {
     /* [68] */
-    /* fn sinh(f32) -> f32 */
-    /* fn sinh<N : num>(vec<N, f32>) -> vec<N, f32> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[251],
+    /* fn storageBarrier() */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[266],
   },
   {
     /* [69] */
-    /* fn smoothStep(f32, f32, f32) -> f32 */
-    /* fn smoothStep<N : num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
+    /* fn tan(f32) -> f32 */
+    /* fn tan<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
     /* overloads */ &kOverloads[253],
   },
   {
     /* [70] */
-    /* fn sqrt(f32) -> f32 */
-    /* fn sqrt<N : num>(vec<N, f32>) -> vec<N, f32> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[255],
-  },
-  {
-    /* [71] */
-    /* fn step(f32, f32) -> f32 */
-    /* fn step<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[257],
-  },
-  {
-    /* [72] */
-    /* fn storageBarrier() */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[274],
-  },
-  {
-    /* [73] */
-    /* fn tan(f32) -> f32 */
-    /* fn tan<N : num>(vec<N, f32>) -> vec<N, f32> */
-    /* num overloads */ 2,
-    /* overloads */ &kOverloads[261],
-  },
-  {
-    /* [74] */
     /* fn tanh(f32) -> f32 */
     /* fn tanh<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[227],
+    /* overloads */ &kOverloads[223],
   },
   {
-    /* [75] */
+    /* [71] */
     /* fn transpose<M : num, N : num>(mat<M, N, f32>) -> mat<N, M, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[267],
+    /* overloads */ &kOverloads[259],
   },
   {
-    /* [76] */
+    /* [72] */
     /* fn trunc(f32) -> f32 */
     /* fn trunc<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
+    /* overloads */ &kOverloads[145],
+  },
+  {
+    /* [73] */
+    /* fn unpack2x16float(u32) -> vec2<f32> */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[260],
+  },
+  {
+    /* [74] */
+    /* fn unpack2x16snorm(u32) -> vec2<f32> */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[261],
+  },
+  {
+    /* [75] */
+    /* fn unpack2x16unorm(u32) -> vec2<f32> */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[262],
+  },
+  {
+    /* [76] */
+    /* fn unpack4x8snorm(u32) -> vec4<f32> */
+    /* num overloads */ 1,
     /* overloads */ &kOverloads[263],
   },
   {
     /* [77] */
-    /* fn unpack2x16float(u32) -> vec2<f32> */
+    /* fn unpack4x8unorm(u32) -> vec4<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[268],
+    /* overloads */ &kOverloads[264],
   },
   {
     /* [78] */
-    /* fn unpack2x16snorm(u32) -> vec2<f32> */
+    /* fn workgroupBarrier() */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[269],
+    /* overloads */ &kOverloads[265],
   },
   {
     /* [79] */
-    /* fn unpack2x16unorm(u32) -> vec2<f32> */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[270],
-  },
-  {
-    /* [80] */
-    /* fn unpack4x8snorm(u32) -> vec4<f32> */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[271],
-  },
-  {
-    /* [81] */
-    /* fn unpack4x8unorm(u32) -> vec4<f32> */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[272],
-  },
-  {
-    /* [82] */
-    /* fn workgroupBarrier() */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[273],
-  },
-  {
-    /* [83] */
     /* fn textureDimensions<T : fiu32>(texture: texture_1d<T>) -> i32 */
     /* fn textureDimensions<T : fiu32>(texture: texture_1d<T>, level: i32) -> i32 */
     /* fn textureDimensions<T : fiu32>(texture: texture_2d<T>) -> vec2<i32> */
@@ -9492,7 +9328,7 @@
     /* overloads */ &kOverloads[0],
   },
   {
-    /* [84] */
+    /* [80] */
     /* fn textureGather<T : fiu32>(component: i32, texture: texture_2d<T>, sampler: sampler, coords: vec2<f32>) -> vec4<T> */
     /* fn textureGather<T : fiu32>(component: i32, texture: texture_2d<T>, sampler: sampler, coords: vec2<f32>, offset: vec2<i32>) -> vec4<T> */
     /* fn textureGather<T : fiu32>(component: i32, texture: texture_2d_array<T>, sampler: sampler, coords: vec2<f32>, array_index: i32) -> vec4<T> */
@@ -9509,7 +9345,7 @@
     /* overloads */ &kOverloads[57],
   },
   {
-    /* [85] */
+    /* [81] */
     /* fn textureGatherCompare(texture: texture_depth_2d, sampler: sampler_comparison, coords: vec2<f32>, depth_ref: f32) -> vec4<f32> */
     /* fn textureGatherCompare(texture: texture_depth_2d, sampler: sampler_comparison, coords: vec2<f32>, depth_ref: f32, offset: vec2<i32>) -> vec4<f32> */
     /* fn textureGatherCompare(texture: texture_depth_2d_array, sampler: sampler_comparison, coords: vec2<f32>, array_index: i32, depth_ref: f32) -> vec4<f32> */
@@ -9520,7 +9356,7 @@
     /* overloads */ &kOverloads[116],
   },
   {
-    /* [86] */
+    /* [82] */
     /* fn textureNumLayers<T : fiu32>(texture: texture_2d_array<T>) -> i32 */
     /* fn textureNumLayers<T : fiu32>(texture: texture_cube_array<T>) -> i32 */
     /* fn textureNumLayers(texture: texture_depth_2d_array) -> i32 */
@@ -9530,7 +9366,7 @@
     /* overloads */ &kOverloads[134],
   },
   {
-    /* [87] */
+    /* [83] */
     /* fn textureNumLevels<T : fiu32>(texture: texture_1d<T>) -> i32 */
     /* fn textureNumLevels<T : fiu32>(texture: texture_2d<T>) -> i32 */
     /* fn textureNumLevels<T : fiu32>(texture: texture_2d_array<T>) -> i32 */
@@ -9545,14 +9381,14 @@
     /* overloads */ &kOverloads[81],
   },
   {
-    /* [88] */
+    /* [84] */
     /* fn textureNumSamples<T : fiu32>(texture: texture_multisampled_2d<T>) -> i32 */
     /* fn textureNumSamples(texture: texture_depth_multisampled_2d) -> i32 */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[229],
+    /* overloads */ &kOverloads[221],
   },
   {
-    /* [89] */
+    /* [85] */
     /* fn textureSample(texture: texture_1d<f32>, sampler: sampler, coords: f32) -> vec4<f32> */
     /* fn textureSample(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>) -> vec4<f32> */
     /* fn textureSample(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, offset: vec2<i32>) -> vec4<f32> */
@@ -9572,7 +9408,7 @@
     /* overloads */ &kOverloads[42],
   },
   {
-    /* [90] */
+    /* [86] */
     /* fn textureSampleBias(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, bias: f32) -> vec4<f32> */
     /* fn textureSampleBias(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, bias: f32, offset: vec2<i32>) -> vec4<f32> */
     /* fn textureSampleBias(texture: texture_2d_array<f32>, sampler: sampler, coords: vec2<f32>, array_index: i32, bias: f32) -> vec4<f32> */
@@ -9582,10 +9418,10 @@
     /* fn textureSampleBias(texture: texture_cube<f32>, sampler: sampler, coords: vec3<f32>, bias: f32) -> vec4<f32> */
     /* fn textureSampleBias(texture: texture_cube_array<f32>, sampler: sampler, coords: vec3<f32>, array_index: i32, bias: f32) -> vec4<f32> */
     /* num overloads */ 8,
-    /* overloads */ &kOverloads[108],
+    /* overloads */ &kOverloads[100],
   },
   {
-    /* [91] */
+    /* [87] */
     /* fn textureSampleCompare(texture: texture_depth_2d, sampler: sampler_comparison, coords: vec2<f32>, depth_ref: f32) -> f32 */
     /* fn textureSampleCompare(texture: texture_depth_2d, sampler: sampler_comparison, coords: vec2<f32>, depth_ref: f32, offset: vec2<i32>) -> f32 */
     /* fn textureSampleCompare(texture: texture_depth_2d_array, sampler: sampler_comparison, coords: vec2<f32>, array_index: i32, depth_ref: f32) -> f32 */
@@ -9593,10 +9429,10 @@
     /* fn textureSampleCompare(texture: texture_depth_cube, sampler: sampler_comparison, coords: vec3<f32>, depth_ref: f32) -> f32 */
     /* fn textureSampleCompare(texture: texture_depth_cube_array, sampler: sampler_comparison, coords: vec3<f32>, array_index: i32, depth_ref: f32) -> f32 */
     /* num overloads */ 6,
-    /* overloads */ &kOverloads[128],
+    /* overloads */ &kOverloads[122],
   },
   {
-    /* [92] */
+    /* [88] */
     /* fn textureSampleCompareLevel(texture: texture_depth_2d, sampler: sampler_comparison, coords: vec2<f32>, depth_ref: f32) -> f32 */
     /* fn textureSampleCompareLevel(texture: texture_depth_2d, sampler: sampler_comparison, coords: vec2<f32>, depth_ref: f32, offset: vec2<i32>) -> f32 */
     /* fn textureSampleCompareLevel(texture: texture_depth_2d_array, sampler: sampler_comparison, coords: vec2<f32>, array_index: i32, depth_ref: f32) -> f32 */
@@ -9604,10 +9440,10 @@
     /* fn textureSampleCompareLevel(texture: texture_depth_cube, sampler: sampler_comparison, coords: vec3<f32>, depth_ref: f32) -> f32 */
     /* fn textureSampleCompareLevel(texture: texture_depth_cube_array, sampler: sampler_comparison, coords: vec3<f32>, array_index: i32, depth_ref: f32) -> f32 */
     /* num overloads */ 6,
-    /* overloads */ &kOverloads[122],
+    /* overloads */ &kOverloads[128],
   },
   {
-    /* [93] */
+    /* [89] */
     /* fn textureSampleGrad(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, ddx: vec2<f32>, ddy: vec2<f32>) -> vec4<f32> */
     /* fn textureSampleGrad(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, ddx: vec2<f32>, ddy: vec2<f32>, offset: vec2<i32>) -> vec4<f32> */
     /* fn textureSampleGrad(texture: texture_2d_array<f32>, sampler: sampler, coords: vec2<f32>, array_index: i32, ddx: vec2<f32>, ddy: vec2<f32>) -> vec4<f32> */
@@ -9617,10 +9453,10 @@
     /* fn textureSampleGrad(texture: texture_cube<f32>, sampler: sampler, coords: vec3<f32>, ddx: vec3<f32>, ddy: vec3<f32>) -> vec4<f32> */
     /* fn textureSampleGrad(texture: texture_cube_array<f32>, sampler: sampler, coords: vec3<f32>, array_index: i32, ddx: vec3<f32>, ddy: vec3<f32>) -> vec4<f32> */
     /* num overloads */ 8,
-    /* overloads */ &kOverloads[100],
+    /* overloads */ &kOverloads[108],
   },
   {
-    /* [94] */
+    /* [90] */
     /* fn textureSampleLevel(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, level: f32) -> vec4<f32> */
     /* fn textureSampleLevel(texture: texture_2d<f32>, sampler: sampler, coords: vec2<f32>, level: f32, offset: vec2<i32>) -> vec4<f32> */
     /* fn textureSampleLevel(texture: texture_2d_array<f32>, sampler: sampler, coords: vec2<f32>, array_index: i32, level: f32) -> vec4<f32> */
@@ -9640,7 +9476,7 @@
     /* overloads */ &kOverloads[27],
   },
   {
-    /* [95] */
+    /* [91] */
     /* fn textureStore(texture: texture_storage_1d<f32_texel_format, write>, coords: i32, value: vec4<f32>) */
     /* fn textureStore(texture: texture_storage_2d<f32_texel_format, write>, coords: vec2<i32>, value: vec4<f32>) */
     /* fn textureStore(texture: texture_storage_2d_array<f32_texel_format, write>, coords: vec2<i32>, array_index: i32, value: vec4<f32>) */
@@ -9657,7 +9493,7 @@
     /* overloads */ &kOverloads[69],
   },
   {
-    /* [96] */
+    /* [92] */
     /* fn textureLoad<T : fiu32>(texture: texture_1d<T>, coords: i32, level: i32) -> vec4<T> */
     /* fn textureLoad<T : fiu32>(texture: texture_2d<T>, coords: vec2<i32>, level: i32) -> vec4<T> */
     /* fn textureLoad<T : fiu32>(texture: texture_2d_array<T>, coords: vec2<i32>, array_index: i32, level: i32) -> vec4<T> */
@@ -9671,70 +9507,70 @@
     /* overloads */ &kOverloads[91],
   },
   {
-    /* [97] */
+    /* [93] */
     /* fn atomicLoad<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>) -> T */
     /* num overloads */ 1,
+    /* overloads */ &kOverloads[280],
+  },
+  {
+    /* [94] */
+    /* fn atomicStore<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[281],
+  },
+  {
+    /* [95] */
+    /* fn atomicAdd<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[282],
+  },
+  {
+    /* [96] */
+    /* fn atomicSub<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[283],
+  },
+  {
+    /* [97] */
+    /* fn atomicMax<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[284],
+  },
+  {
+    /* [98] */
+    /* fn atomicMin<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[285],
+  },
+  {
+    /* [99] */
+    /* fn atomicAnd<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[286],
+  },
+  {
+    /* [100] */
+    /* fn atomicOr<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
+    /* num overloads */ 1,
+    /* overloads */ &kOverloads[287],
+  },
+  {
+    /* [101] */
+    /* fn atomicXor<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
+    /* num overloads */ 1,
     /* overloads */ &kOverloads[288],
   },
   {
-    /* [98] */
-    /* fn atomicStore<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) */
+    /* [102] */
+    /* fn atomicExchange<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
     /* overloads */ &kOverloads[289],
   },
   {
-    /* [99] */
-    /* fn atomicAdd<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[290],
-  },
-  {
-    /* [100] */
-    /* fn atomicSub<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[291],
-  },
-  {
-    /* [101] */
-    /* fn atomicMax<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[292],
-  },
-  {
-    /* [102] */
-    /* fn atomicMin<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[293],
-  },
-  {
     /* [103] */
-    /* fn atomicAnd<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[294],
-  },
-  {
-    /* [104] */
-    /* fn atomicOr<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[295],
-  },
-  {
-    /* [105] */
-    /* fn atomicXor<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[296],
-  },
-  {
-    /* [106] */
-    /* fn atomicExchange<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
-    /* num overloads */ 1,
-    /* overloads */ &kOverloads[297],
-  },
-  {
-    /* [107] */
     /* fn atomicCompareExchangeWeak<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T, T) -> vec2<T> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[298],
+    /* overloads */ &kOverloads[290],
   },
 };
 
diff --git a/src/tint/builtins.def b/src/tint/builtins.def
index 4771afb..44bb1a8 100644
--- a/src/tint/builtins.def
+++ b/src/tint/builtins.def
@@ -340,14 +340,6 @@
 fn insertBits<N: num, T: iu32>(vec<N, T>, vec<N, T>, u32, u32) -> vec<N, T>
 fn inverseSqrt(f32) -> f32
 fn inverseSqrt<N: num>(vec<N, f32>) -> vec<N, f32>
-[[deprecated]] fn isFinite(f32) -> bool
-[[deprecated]] fn isFinite<N: num>(vec<N, f32>) -> vec<N, bool>
-[[deprecated]] fn isInf(f32) -> bool
-[[deprecated]] fn isInf<N: num>(vec<N, f32>) -> vec<N, bool>
-[[deprecated]] fn isNan(f32) -> bool
-[[deprecated]] fn isNan<N: num>(vec<N, f32>) -> vec<N, bool>
-[[deprecated]] fn isNormal(f32) -> bool
-[[deprecated]] fn isNormal<N: num>(vec<N, f32>) -> vec<N, bool>
 fn ldexp(f32, i32) -> f32
 fn ldexp<N: num>(vec<N, f32>, vec<N, i32>) -> vec<N, f32>
 fn length(f32) -> f32
diff --git a/src/tint/resolver/builtin_test.cc b/src/tint/resolver/builtin_test.cc
index 8914783..d449678 100644
--- a/src/tint/resolver/builtin_test.cc
+++ b/src/tint/resolver/builtin_test.cc
@@ -138,75 +138,6 @@
                          ResolverBuiltinTest_BoolMethod,
                          testing::Values("any", "all"));
 
-using ResolverBuiltinTest_FloatMethod = ResolverTestWithParam<std::string>;
-TEST_P(ResolverBuiltinTest_FloatMethod, Vector) {
-  auto name = GetParam();
-
-  Global("my_var", ty.vec3<f32>(), ast::StorageClass::kPrivate);
-
-  auto* expr = Call(name, "my_var");
-  WrapInFunction(expr);
-
-  EXPECT_TRUE(r()->Resolve()) << r()->error();
-
-  ASSERT_NE(TypeOf(expr), nullptr);
-  ASSERT_TRUE(TypeOf(expr)->Is<sem::Vector>());
-  EXPECT_TRUE(TypeOf(expr)->As<sem::Vector>()->type()->Is<sem::Bool>());
-  EXPECT_EQ(TypeOf(expr)->As<sem::Vector>()->Width(), 3u);
-}
-
-TEST_P(ResolverBuiltinTest_FloatMethod, Scalar) {
-  auto name = GetParam();
-
-  Global("my_var", ty.f32(), ast::StorageClass::kPrivate);
-
-  auto* expr = Call(name, "my_var");
-  WrapInFunction(expr);
-
-  EXPECT_TRUE(r()->Resolve()) << r()->error();
-
-  ASSERT_NE(TypeOf(expr), nullptr);
-  EXPECT_TRUE(TypeOf(expr)->Is<sem::Bool>());
-}
-
-TEST_P(ResolverBuiltinTest_FloatMethod, MissingParam) {
-  auto name = GetParam();
-
-  Global("my_var", ty.f32(), ast::StorageClass::kPrivate);
-
-  auto* expr = Call(name);
-  WrapInFunction(expr);
-
-  EXPECT_FALSE(r()->Resolve());
-
-  EXPECT_EQ(r()->error(), "error: no matching call to " + name +
-                              "()\n\n"
-                              "2 candidate functions:\n  " +
-                              name + "(f32) -> bool\n  " + name +
-                              "(vecN<f32>) -> vecN<bool>\n");
-}
-
-TEST_P(ResolverBuiltinTest_FloatMethod, TooManyParams) {
-  auto name = GetParam();
-
-  Global("my_var", ty.f32(), ast::StorageClass::kPrivate);
-
-  auto* expr = Call(name, "my_var", 1.23f);
-  WrapInFunction(expr);
-
-  EXPECT_FALSE(r()->Resolve());
-
-  EXPECT_EQ(r()->error(), "error: no matching call to " + name +
-                              "(f32, f32)\n\n"
-                              "2 candidate functions:\n  " +
-                              name + "(f32) -> bool\n  " + name +
-                              "(vecN<f32>) -> vecN<bool>\n");
-}
-INSTANTIATE_TEST_SUITE_P(
-    ResolverTest,
-    ResolverBuiltinTest_FloatMethod,
-    testing::Values("isInf", "isNan", "isFinite", "isNormal"));
-
 enum class Texture { kF32, kI32, kU32 };
 inline std::ostream& operator<<(std::ostream& out, Texture data) {
   if (data == Texture::kF32) {
diff --git a/src/tint/sem/builtin.cc b/src/tint/sem/builtin.cc
index 90187ea..02533f4 100644
--- a/src/tint/sem/builtin.cc
+++ b/src/tint/sem/builtin.cc
@@ -46,11 +46,6 @@
          IsFineDerivativeBuiltin(i);
 }
 
-bool IsFloatClassificationBuiltin(BuiltinType i) {
-  return i == BuiltinType::kIsFinite || i == BuiltinType::kIsInf ||
-         i == BuiltinType::kIsNan || i == BuiltinType::kIsNormal;
-}
-
 bool IsTextureBuiltin(BuiltinType i) {
   return IsImageQueryBuiltin(i) || i == BuiltinType::kTextureLoad ||
          i == BuiltinType::kTextureGather ||
@@ -132,10 +127,6 @@
   return IsDerivativeBuiltin(type_);
 }
 
-bool Builtin::IsFloatClassification() const {
-  return IsFloatClassificationBuiltin(type_);
-}
-
 bool Builtin::IsTexture() const {
   return IsTextureBuiltin(type_);
 }
diff --git a/src/tint/sem/builtin.h b/src/tint/sem/builtin.h
index 6ad4b00..533a30b 100644
--- a/src/tint/sem/builtin.h
+++ b/src/tint/sem/builtin.h
@@ -41,11 +41,6 @@
 /// @returns true if the given `i` is a derivative builtin
 bool IsDerivativeBuiltin(BuiltinType i);
 
-/// Determines if the given `i` is a float classification builtin
-/// @param i the builtin type
-/// @returns true if the given `i` is a float builtin
-bool IsFloatClassificationBuiltin(BuiltinType i);
-
 /// Determines if the given `i` is a texture operation builtin
 /// @param i the builtin type
 /// @returns true if the given `i` is a texture operation builtin
@@ -118,9 +113,6 @@
   /// @returns true if builtin is a derivative builtin
   bool IsDerivative() const;
 
-  /// @returns true if builtin is a float builtin
-  bool IsFloatClassification() const;
-
   /// @returns true if builtin is a texture operation builtin
   bool IsTexture() const;
 
diff --git a/src/tint/sem/builtin_test.cc b/src/tint/sem/builtin_test.cc
index f489003..545e82c 100644
--- a/src/tint/sem/builtin_test.cc
+++ b/src/tint/sem/builtin_test.cc
@@ -75,10 +75,6 @@
         BuiltinData{"fwidthCoarse", BuiltinType::kFwidthCoarse},
         BuiltinData{"fwidthFine", BuiltinType::kFwidthFine},
         BuiltinData{"inverseSqrt", BuiltinType::kInverseSqrt},
-        BuiltinData{"isFinite", BuiltinType::kIsFinite},
-        BuiltinData{"isInf", BuiltinType::kIsInf},
-        BuiltinData{"isNan", BuiltinType::kIsNan},
-        BuiltinData{"isNormal", BuiltinType::kIsNormal},
         BuiltinData{"ldexp", BuiltinType::kLdexp},
         BuiltinData{"length", BuiltinType::kLength},
         BuiltinData{"log", BuiltinType::kLog},
diff --git a/src/tint/sem/builtin_type.cc b/src/tint/sem/builtin_type.cc
index 9f95e70..2c51e2b 100644
--- a/src/tint/sem/builtin_type.cc
+++ b/src/tint/sem/builtin_type.cc
@@ -153,18 +153,6 @@
   if (name == "inverseSqrt") {
     return BuiltinType::kInverseSqrt;
   }
-  if (name == "isFinite") {
-    return BuiltinType::kIsFinite;
-  }
-  if (name == "isInf") {
-    return BuiltinType::kIsInf;
-  }
-  if (name == "isNan") {
-    return BuiltinType::kIsNan;
-  }
-  if (name == "isNormal") {
-    return BuiltinType::kIsNormal;
-  }
   if (name == "ldexp") {
     return BuiltinType::kLdexp;
   }
@@ -443,14 +431,6 @@
       return "insertBits";
     case BuiltinType::kInverseSqrt:
       return "inverseSqrt";
-    case BuiltinType::kIsFinite:
-      return "isFinite";
-    case BuiltinType::kIsInf:
-      return "isInf";
-    case BuiltinType::kIsNan:
-      return "isNan";
-    case BuiltinType::kIsNormal:
-      return "isNormal";
     case BuiltinType::kLdexp:
       return "ldexp";
     case BuiltinType::kLength:
diff --git a/src/tint/sem/builtin_type.h b/src/tint/sem/builtin_type.h
index c53468e..8cbadf2 100644
--- a/src/tint/sem/builtin_type.h
+++ b/src/tint/sem/builtin_type.h
@@ -75,10 +75,6 @@
   kFwidthFine,
   kInsertBits,
   kInverseSqrt,
-  kIsFinite,
-  kIsInf,
-  kIsNan,
-  kIsNormal,
   kLdexp,
   kLength,
   kLog,
diff --git a/src/tint/writer/glsl/generator_impl.cc b/src/tint/writer/glsl/generator_impl.cc
index 3c22dba..271728f 100644
--- a/src/tint/writer/glsl/generator_impl.cc
+++ b/src/tint/writer/glsl/generator_impl.cc
@@ -663,9 +663,6 @@
   if (builtin->Type() == sem::BuiltinType::kFrexp) {
     return EmitFrexpCall(out, expr, builtin);
   }
-  if (builtin->Type() == sem::BuiltinType::kIsNormal) {
-    return EmitIsNormalCall(out, expr, builtin);
-  }
   if (builtin->Type() == sem::BuiltinType::kDegrees) {
     return EmitDegreesCall(out, expr, builtin);
   }
@@ -1191,40 +1188,6 @@
       });
 }
 
-bool GeneratorImpl::EmitIsNormalCall(std::ostream& out,
-                                     const ast::CallExpression* expr,
-                                     const sem::Builtin* builtin) {
-  // GLSL doesn't have a isNormal builtin, we need to emulate
-  return CallBuiltinHelper(
-      out, expr, builtin,
-      [&](TextBuffer* b, const std::vector<std::string>& params) {
-        auto* input_ty = builtin->Parameters()[0]->Type();
-
-        std::string vec_type;
-        if (auto* vec = input_ty->As<sem::Vector>()) {
-          vec_type = "uvec" + std::to_string(vec->Width());
-        } else {
-          vec_type = "uint";
-        }
-
-        constexpr auto* kExponentMask = "0x7f80000u";
-        constexpr auto* kMinNormalExponent = "0x0080000u";
-        constexpr auto* kMaxNormalExponent = "0x7f00000u";
-
-        line(b) << vec_type << " exponent = floatBitsToUint(" << params[0]
-                << ") & " << kExponentMask << ";";
-        line(b) << vec_type << " clamped = "
-                << "clamp(exponent, " << kMinNormalExponent << ", "
-                << kMaxNormalExponent << ");";
-        if (input_ty->Is<sem::Vector>()) {
-          line(b) << "return equal(clamped, exponent);";
-        } else {
-          line(b) << "return clamped == exponent;";
-        }
-        return true;
-      });
-}
-
 bool GeneratorImpl::EmitDegreesCall(std::ostream& out,
                                     const ast::CallExpression* expr,
                                     const sem::Builtin* builtin) {
@@ -1625,12 +1588,6 @@
       return "fwidth";
     case sem::BuiltinType::kInverseSqrt:
       return "inversesqrt";
-    case sem::BuiltinType::kIsFinite:
-      return "isfinite";
-    case sem::BuiltinType::kIsInf:
-      return "isinf";
-    case sem::BuiltinType::kIsNan:
-      return "isnan";
     case sem::BuiltinType::kMix:
       return "mix";
     case sem::BuiltinType::kPack2x16float:
diff --git a/src/tint/writer/glsl/generator_impl.h b/src/tint/writer/glsl/generator_impl.h
index 791e54e..b158391 100644
--- a/src/tint/writer/glsl/generator_impl.h
+++ b/src/tint/writer/glsl/generator_impl.h
@@ -239,14 +239,6 @@
   bool EmitFrexpCall(std::ostream& out,
                      const ast::CallExpression* expr,
                      const sem::Builtin* builtin);
-  /// Handles generating a call to the `isNormal()` builtin
-  /// @param out the output of the expression stream
-  /// @param expr the call expression
-  /// @param builtin the semantic information for the builtin
-  /// @returns true if the call expression is emitted
-  bool EmitIsNormalCall(std::ostream& out,
-                        const ast::CallExpression* expr,
-                        const sem::Builtin* builtin);
   /// Handles generating a call to the `degrees()` builtin
   /// @param out the output of the expression stream
   /// @param expr the call expression
diff --git a/src/tint/writer/glsl/generator_impl_builtin_test.cc b/src/tint/writer/glsl/generator_impl_builtin_test.cc
index f96a463..a7697df 100644
--- a/src/tint/writer/glsl/generator_impl_builtin_test.cc
+++ b/src/tint/writer/glsl/generator_impl_builtin_test.cc
@@ -84,10 +84,6 @@
     case BuiltinType::kFwidthCoarse:
     case BuiltinType::kFwidthFine:
     case BuiltinType::kInverseSqrt:
-    case BuiltinType::kIsFinite:
-    case BuiltinType::kIsInf:
-    case BuiltinType::kIsNan:
-    case BuiltinType::kIsNormal:
     case BuiltinType::kLength:
     case BuiltinType::kLog:
     case BuiltinType::kLog2:
@@ -219,9 +215,6 @@
         BuiltinData{BuiltinType::kFwidthCoarse, ParamType::kF32, "fwidth"},
         BuiltinData{BuiltinType::kFwidthFine, ParamType::kF32, "fwidth"},
         BuiltinData{BuiltinType::kInverseSqrt, ParamType::kF32, "inversesqrt"},
-        BuiltinData{BuiltinType::kIsFinite, ParamType::kF32, "isfinite"},
-        BuiltinData{BuiltinType::kIsInf, ParamType::kF32, "isinf"},
-        BuiltinData{BuiltinType::kIsNan, ParamType::kF32, "isnan"},
         BuiltinData{BuiltinType::kLdexp, ParamType::kF32, "ldexp"},
         BuiltinData{BuiltinType::kLength, ParamType::kF32, "length"},
         BuiltinData{BuiltinType::kLog, ParamType::kF32, "log"},
@@ -248,10 +241,6 @@
         BuiltinData{BuiltinType::kTranspose, ParamType::kF32, "transpose"},
         BuiltinData{BuiltinType::kTrunc, ParamType::kF32, "trunc"}));
 
-TEST_F(GlslGeneratorImplTest_Builtin, DISABLED_Builtin_IsNormal) {
-  FAIL();
-}
-
 TEST_F(GlslGeneratorImplTest_Builtin, Builtin_Call) {
   auto* call = Call("dot", "param1", "param2");
 
@@ -416,62 +405,6 @@
 )"));
 }
 
-TEST_F(GlslGeneratorImplTest_Builtin, IsNormal_Scalar) {
-  auto* val = Var("val", ty.f32());
-  auto* call = Call("isNormal", val);
-  WrapInFunction(val, call);
-
-  GeneratorImpl& gen = SanitizeAndBuild();
-
-  ASSERT_TRUE(gen.Generate()) << gen.error();
-  EXPECT_THAT(gen.result(), HasSubstr(R"(ion 310 es
-
-bool tint_isNormal(float param_0) {
-  uint exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uint clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return clamped == exponent;
-}
-
-
-void test_function() {
-  float val = 0.0f;
-  bool tint_symbol = tint_isNormal(val);
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  test_function();
-)"));
-}
-
-TEST_F(GlslGeneratorImplTest_Builtin, IsNormal_Vector) {
-  auto* val = Var("val", ty.vec3<f32>());
-  auto* call = Call("isNormal", val);
-  WrapInFunction(val, call);
-
-  GeneratorImpl& gen = SanitizeAndBuild();
-
-  ASSERT_TRUE(gen.Generate()) << gen.error();
-  EXPECT_THAT(gen.result(), HasSubstr(R"( 310 es
-
-bvec3 tint_isNormal(vec3 param_0) {
-  uvec3 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec3 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void test_function() {
-  vec3 val = vec3(0.0f, 0.0f, 0.0f);
-  bvec3 tint_symbol = tint_isNormal(val);
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  test_function();
-)"));
-}
-
 TEST_F(GlslGeneratorImplTest_Builtin, Degrees_Scalar) {
   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 0ddd070..7ef3281 100644
--- a/src/tint/writer/hlsl/generator_impl.cc
+++ b/src/tint/writer/hlsl/generator_impl.cc
@@ -1034,9 +1034,6 @@
   if (builtin->Type() == sem::BuiltinType::kFrexp) {
     return EmitFrexpCall(out, expr, builtin);
   }
-  if (builtin->Type() == sem::BuiltinType::kIsNormal) {
-    return EmitIsNormalCall(out, expr, builtin);
-  }
   if (builtin->Type() == sem::BuiltinType::kDegrees) {
     return EmitDegreesCall(out, expr, builtin);
   }
@@ -1922,34 +1919,6 @@
       });
 }
 
-bool GeneratorImpl::EmitIsNormalCall(std::ostream& out,
-                                     const ast::CallExpression* expr,
-                                     const sem::Builtin* builtin) {
-  // HLSL doesn't have a isNormal builtin, we need to emulate
-  return CallBuiltinHelper(
-      out, expr, builtin,
-      [&](TextBuffer* b, const std::vector<std::string>& params) {
-        auto* input_ty = builtin->Parameters()[0]->Type();
-
-        std::string width;
-        if (auto* vec = input_ty->As<sem::Vector>()) {
-          width = std::to_string(vec->Width());
-        }
-
-        constexpr auto* kExponentMask = "0x7f80000";
-        constexpr auto* kMinNormalExponent = "0x0080000";
-        constexpr auto* kMaxNormalExponent = "0x7f00000";
-
-        line(b) << "uint" << width << " exponent = asuint(" << params[0]
-                << ") & " << kExponentMask << ";";
-        line(b) << "uint" << width << " clamped = "
-                << "clamp(exponent, " << kMinNormalExponent << ", "
-                << kMaxNormalExponent << ");";
-        line(b) << "return clamped == exponent;";
-        return true;
-      });
-}
-
 bool GeneratorImpl::EmitDegreesCall(std::ostream& out,
                                     const ast::CallExpression* expr,
                                     const sem::Builtin* builtin) {
@@ -2571,12 +2540,6 @@
       return "fwidth";
     case sem::BuiltinType::kInverseSqrt:
       return "rsqrt";
-    case sem::BuiltinType::kIsFinite:
-      return "isfinite";
-    case sem::BuiltinType::kIsInf:
-      return "isinf";
-    case sem::BuiltinType::kIsNan:
-      return "isnan";
     case sem::BuiltinType::kMix:
       return "lerp";
     case sem::BuiltinType::kReverseBits:
diff --git a/src/tint/writer/hlsl/generator_impl.h b/src/tint/writer/hlsl/generator_impl.h
index 48046ba..e3bb1b3 100644
--- a/src/tint/writer/hlsl/generator_impl.h
+++ b/src/tint/writer/hlsl/generator_impl.h
@@ -241,14 +241,6 @@
   bool EmitFrexpCall(std::ostream& out,
                      const ast::CallExpression* expr,
                      const sem::Builtin* builtin);
-  /// Handles generating a call to the `isNormal()` builtin
-  /// @param out the output of the expression stream
-  /// @param expr the call expression
-  /// @param builtin the semantic information for the builtin
-  /// @returns true if the call expression is emitted
-  bool EmitIsNormalCall(std::ostream& out,
-                        const ast::CallExpression* expr,
-                        const sem::Builtin* builtin);
   /// Handles generating a call to the `degrees()` builtin
   /// @param out the output of the expression stream
   /// @param expr the call expression
diff --git a/src/tint/writer/hlsl/generator_impl_builtin_test.cc b/src/tint/writer/hlsl/generator_impl_builtin_test.cc
index 5f21799..4177094 100644
--- a/src/tint/writer/hlsl/generator_impl_builtin_test.cc
+++ b/src/tint/writer/hlsl/generator_impl_builtin_test.cc
@@ -84,10 +84,6 @@
     case BuiltinType::kFwidthCoarse:
     case BuiltinType::kFwidthFine:
     case BuiltinType::kInverseSqrt:
-    case BuiltinType::kIsFinite:
-    case BuiltinType::kIsInf:
-    case BuiltinType::kIsNan:
-    case BuiltinType::kIsNormal:
     case BuiltinType::kLength:
     case BuiltinType::kLog:
     case BuiltinType::kLog2:
@@ -219,9 +215,6 @@
         BuiltinData{BuiltinType::kFwidthCoarse, ParamType::kF32, "fwidth"},
         BuiltinData{BuiltinType::kFwidthFine, ParamType::kF32, "fwidth"},
         BuiltinData{BuiltinType::kInverseSqrt, ParamType::kF32, "rsqrt"},
-        BuiltinData{BuiltinType::kIsFinite, ParamType::kF32, "isfinite"},
-        BuiltinData{BuiltinType::kIsInf, ParamType::kF32, "isinf"},
-        BuiltinData{BuiltinType::kIsNan, ParamType::kF32, "isnan"},
         BuiltinData{BuiltinType::kLdexp, ParamType::kF32, "ldexp"},
         BuiltinData{BuiltinType::kLength, ParamType::kF32, "length"},
         BuiltinData{BuiltinType::kLog, ParamType::kF32, "log"},
@@ -247,10 +240,6 @@
         BuiltinData{BuiltinType::kTranspose, ParamType::kF32, "transpose"},
         BuiltinData{BuiltinType::kTrunc, ParamType::kF32, "trunc"}));
 
-TEST_F(HlslGeneratorImplTest_Builtin, DISABLED_Builtin_IsNormal) {
-  FAIL();
-}
-
 TEST_F(HlslGeneratorImplTest_Builtin, Builtin_Call) {
   auto* call = Call("dot", "param1", "param2");
 
@@ -394,52 +383,6 @@
 )");
 }
 
-TEST_F(HlslGeneratorImplTest_Builtin, IsNormal_Scalar) {
-  auto* val = Var("val", ty.f32());
-  auto* call = Call("isNormal", val);
-  WrapInFunction(val, call);
-
-  GeneratorImpl& gen = SanitizeAndBuild();
-
-  ASSERT_TRUE(gen.Generate()) << gen.error();
-  EXPECT_EQ(gen.result(), R"(bool tint_isNormal(float param_0) {
-  uint exponent = asuint(param_0) & 0x7f80000;
-  uint clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
-[numthreads(1, 1, 1)]
-void test_function() {
-  float val = 0.0f;
-  const bool tint_symbol = tint_isNormal(val);
-  return;
-}
-)");
-}
-
-TEST_F(HlslGeneratorImplTest_Builtin, IsNormal_Vector) {
-  auto* val = Var("val", ty.vec3<f32>());
-  auto* call = Call("isNormal", val);
-  WrapInFunction(val, call);
-
-  GeneratorImpl& gen = SanitizeAndBuild();
-
-  ASSERT_TRUE(gen.Generate()) << gen.error();
-  EXPECT_EQ(gen.result(), R"(bool3 tint_isNormal(float3 param_0) {
-  uint3 exponent = asuint(param_0) & 0x7f80000;
-  uint3 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
-[numthreads(1, 1, 1)]
-void test_function() {
-  float3 val = float3(0.0f, 0.0f, 0.0f);
-  const bool3 tint_symbol = tint_isNormal(val);
-  return;
-}
-)");
-}
-
 TEST_F(HlslGeneratorImplTest_Builtin, Degrees_Scalar) {
   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 f29675e..316dfdc 100644
--- a/src/tint/writer/msl/generator_impl.cc
+++ b/src/tint/writer/msl/generator_impl.cc
@@ -1385,18 +1385,6 @@
     case sem::BuiltinType::kFwidthFine:
       out += "fwidth";
       break;
-    case sem::BuiltinType::kIsFinite:
-      out += "isfinite";
-      break;
-    case sem::BuiltinType::kIsInf:
-      out += "isinf";
-      break;
-    case sem::BuiltinType::kIsNan:
-      out += "isnan";
-      break;
-    case sem::BuiltinType::kIsNormal:
-      out += "isnormal";
-      break;
     case sem::BuiltinType::kMax:
       if (builtin->ReturnType()->is_float_scalar_or_vector()) {
         out += "fmax";
diff --git a/src/tint/writer/msl/generator_impl_builtin_test.cc b/src/tint/writer/msl/generator_impl_builtin_test.cc
index d8cfd54..af9db8e 100644
--- a/src/tint/writer/msl/generator_impl_builtin_test.cc
+++ b/src/tint/writer/msl/generator_impl_builtin_test.cc
@@ -80,10 +80,6 @@
     case BuiltinType::kFwidthCoarse:
     case BuiltinType::kFwidthFine:
     case BuiltinType::kInverseSqrt:
-    case BuiltinType::kIsFinite:
-    case BuiltinType::kIsInf:
-    case BuiltinType::kIsNan:
-    case BuiltinType::kIsNormal:
     case BuiltinType::kLength:
     case BuiltinType::kLog:
     case BuiltinType::kLog2:
@@ -243,10 +239,6 @@
         BuiltinData{BuiltinType::kFwidthFine, ParamType::kF32, "fwidth"},
         BuiltinData{BuiltinType::kInsertBits, ParamType::kU32, "insert_bits"},
         BuiltinData{BuiltinType::kInverseSqrt, ParamType::kF32, "rsqrt"},
-        BuiltinData{BuiltinType::kIsFinite, ParamType::kF32, "isfinite"},
-        BuiltinData{BuiltinType::kIsInf, ParamType::kF32, "isinf"},
-        BuiltinData{BuiltinType::kIsNan, ParamType::kF32, "isnan"},
-        BuiltinData{BuiltinType::kIsNormal, ParamType::kF32, "isnormal"},
         BuiltinData{BuiltinType::kLdexp, ParamType::kF32, "ldexp"},
         BuiltinData{BuiltinType::kLength, ParamType::kF32, "length"},
         BuiltinData{BuiltinType::kLog, ParamType::kF32, "log"},
diff --git a/src/tint/writer/spirv/builder.cc b/src/tint/writer/spirv/builder.cc
index dd5a52d..bec89bd 100644
--- a/src/tint/writer/spirv/builder.cc
+++ b/src/tint/writer/spirv/builder.cc
@@ -2527,116 +2527,6 @@
     case BuiltinType::kInsertBits:
       op = spv::Op::OpBitFieldInsert;
       break;
-    case BuiltinType::kIsInf:
-      op = spv::Op::OpIsInf;
-      break;
-    case BuiltinType::kIsNan:
-      op = spv::Op::OpIsNan;
-      break;
-    case BuiltinType::kIsFinite: {
-      // Implemented as:   not(IsInf or IsNan)
-      auto val_id = get_arg_as_value_id(0);
-      if (!val_id) {
-        return 0;
-      }
-      auto inf_result = result_op();
-      auto nan_result = result_op();
-      auto or_result = result_op();
-      if (push_function_inst(spv::Op::OpIsInf,
-                             {Operand::Int(result_type_id), inf_result,
-                              Operand::Int(val_id)}) &&
-          push_function_inst(spv::Op::OpIsNan,
-                             {Operand::Int(result_type_id), nan_result,
-                              Operand::Int(val_id)}) &&
-          push_function_inst(spv::Op::OpLogicalOr,
-                             {Operand::Int(result_type_id), or_result,
-                              Operand::Int(inf_result.to_i()),
-                              Operand::Int(nan_result.to_i())}) &&
-          push_function_inst(spv::Op::OpLogicalNot,
-                             {Operand::Int(result_type_id), result,
-                              Operand::Int(or_result.to_i())})) {
-        return result_id;
-      }
-      return 0;
-    }
-    case BuiltinType::kIsNormal: {
-      // A normal number is finite, non-zero, and not subnormal.
-      // Its exponent is neither of the extreme possible values.
-      // Implemented as:
-      //   exponent_bits = bitcast<u32>(f);
-      //   clamped = uclamp(1,254,exponent_bits);
-      //   result = (clamped == exponent_bits);
-      //
-      auto val_id = get_arg_as_value_id(0);
-      if (!val_id) {
-        return 0;
-      }
-
-      // These parameters are valid for IEEE 754 binary32
-      const uint32_t kExponentMask = 0x7f80000;
-      const uint32_t kMinNormalExponent = 0x0080000;
-      const uint32_t kMaxNormalExponent = 0x7f00000;
-
-      auto set_id = GetGLSLstd450Import();
-      auto* u32 = builder_.create<sem::U32>();
-
-      auto unsigned_id = GenerateTypeIfNeeded(u32);
-      auto exponent_mask_id =
-          GenerateConstantIfNeeded(ScalarConstant::U32(kExponentMask));
-      auto min_exponent_id =
-          GenerateConstantIfNeeded(ScalarConstant::U32(kMinNormalExponent));
-      auto max_exponent_id =
-          GenerateConstantIfNeeded(ScalarConstant::U32(kMaxNormalExponent));
-      if (auto* fvec_ty = builtin->ReturnType()->As<sem::Vector>()) {
-        // In the vector case, update the unsigned type to a vector type of the
-        // same size, and create vector constants by replicating the scalars.
-        // I expect backend compilers to fold these into unique constants, so
-        // there is no loss of efficiency.
-        auto* uvec_ty = builder_.create<sem::Vector>(u32, fvec_ty->Width());
-        unsigned_id = GenerateTypeIfNeeded(uvec_ty);
-        auto splat = [&](uint32_t scalar_id) -> uint32_t {
-          auto splat_result = result_op();
-          OperandList splat_params{Operand::Int(unsigned_id), splat_result};
-          for (size_t i = 0; i < fvec_ty->Width(); i++) {
-            splat_params.emplace_back(Operand::Int(scalar_id));
-          }
-          if (!push_function_inst(spv::Op::OpCompositeConstruct,
-                                  std::move(splat_params))) {
-            return 0;
-          }
-          return splat_result.to_i();
-        };
-        exponent_mask_id = splat(exponent_mask_id);
-        min_exponent_id = splat(min_exponent_id);
-        max_exponent_id = splat(max_exponent_id);
-      }
-      auto cast_result = result_op();
-      auto exponent_bits_result = result_op();
-      auto clamp_result = result_op();
-
-      if (set_id && unsigned_id && exponent_mask_id && min_exponent_id &&
-          max_exponent_id &&
-          push_function_inst(
-              spv::Op::OpBitcast,
-              {Operand::Int(unsigned_id), cast_result, Operand::Int(val_id)}) &&
-          push_function_inst(spv::Op::OpBitwiseAnd,
-                             {Operand::Int(unsigned_id), exponent_bits_result,
-                              Operand::Int(cast_result.to_i()),
-                              Operand::Int(exponent_mask_id)}) &&
-          push_function_inst(
-              spv::Op::OpExtInst,
-              {Operand::Int(unsigned_id), clamp_result, Operand::Int(set_id),
-               Operand::Int(GLSLstd450UClamp),
-               Operand::Int(exponent_bits_result.to_i()),
-               Operand::Int(min_exponent_id), Operand::Int(max_exponent_id)}) &&
-          push_function_inst(spv::Op::OpIEqual,
-                             {Operand::Int(result_type_id), result,
-                              Operand::Int(exponent_bits_result.to_i()),
-                              Operand::Int(clamp_result.to_i())})) {
-        return result_id;
-      }
-      return 0;
-    }
     case BuiltinType::kMix: {
       auto std450 = Operand::Int(GetGLSLstd450Import());
 
diff --git a/src/tint/writer/spirv/builder_builtin_test.cc b/src/tint/writer/spirv/builder_builtin_test.cc
index 4718e44..bcd7596 100644
--- a/src/tint/writer/spirv/builder_builtin_test.cc
+++ b/src/tint/writer/spirv/builder_builtin_test.cc
@@ -102,225 +102,6 @@
                          testing::Values(BuiltinData{"any", "OpAny"},
                                          BuiltinData{"all", "OpAll"}));
 
-using BuiltinFloatTest = BuiltinBuilderTestWithParam<BuiltinData>;
-TEST_P(BuiltinFloatTest, Call_Float_Scalar) {
-  auto param = GetParam();
-  auto* var = Global("v", ty.f32(), ast::StorageClass::kPrivate);
-  auto* expr = Call(param.name, "v");
-  auto* func = Func("a_func", {}, ty.void_(),
-                    {
-                        Assign(Phony(), expr),
-                    });
-
-  spirv::Builder& b = Build();
-
-  ASSERT_TRUE(b.GenerateGlobalVariable(var)) << b.error();
-  ASSERT_TRUE(b.GenerateFunction(func)) << b.error();
-
-  EXPECT_EQ(DumpInstructions(b.types()), R"(%3 = OpTypeFloat 32
-%2 = OpTypePointer Private %3
-%4 = OpConstantNull %3
-%1 = OpVariable %2 Private %4
-%6 = OpTypeVoid
-%5 = OpTypeFunction %6
-%10 = OpTypeBool
-)");
-
-  auto expected = utils::ReplaceAll(R"(%11 = OpLoad %3 %1
-%9 = ${op} %10 %11
-OpReturn
-)",
-                                    "${op}", param.op);
-  EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), expected);
-}
-
-TEST_P(BuiltinFloatTest, Call_Float_Vector) {
-  auto param = GetParam();
-  auto* var = Global("v", ty.vec3<f32>(), ast::StorageClass::kPrivate);
-  auto* expr = Call(param.name, "v");
-  auto* func = Func("a_func", {}, ty.void_(),
-                    {
-                        Assign(Phony(), expr),
-                    });
-
-  spirv::Builder& b = Build();
-
-  ASSERT_TRUE(b.GenerateGlobalVariable(var)) << b.error();
-  ASSERT_TRUE(b.GenerateFunction(func)) << b.error();
-
-  EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
-%3 = OpTypeVector %4 3
-%2 = OpTypePointer Private %3
-%5 = OpConstantNull %3
-%1 = OpVariable %2 Private %5
-%7 = OpTypeVoid
-%6 = OpTypeFunction %7
-%12 = OpTypeBool
-%11 = OpTypeVector %12 3
-)");
-
-  auto expected = utils::ReplaceAll(R"(%13 = OpLoad %3 %1
-%10 = ${op} %11 %13
-OpReturn
-)",
-                                    "${op}", param.op);
-  EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), expected);
-}
-INSTANTIATE_TEST_SUITE_P(BuiltinBuilderTest,
-                         BuiltinFloatTest,
-                         testing::Values(BuiltinData{"isNan", "OpIsNan"},
-                                         BuiltinData{"isInf", "OpIsInf"}));
-
-TEST_F(BuiltinBuilderTest, IsFinite_Scalar) {
-  auto* var = Global("v", ty.f32(), ast::StorageClass::kPrivate);
-  auto* expr = Call("isFinite", "v");
-  auto* func = Func("a_func", {}, ty.void_(),
-                    {
-                        Assign(Phony(), expr),
-                    });
-
-  spirv::Builder& b = Build();
-
-  ASSERT_TRUE(b.GenerateGlobalVariable(var)) << b.error();
-  ASSERT_TRUE(b.GenerateFunction(func)) << b.error();
-
-  EXPECT_EQ(DumpInstructions(b.types()), R"(%3 = OpTypeFloat 32
-%2 = OpTypePointer Private %3
-%4 = OpConstantNull %3
-%1 = OpVariable %2 Private %4
-%6 = OpTypeVoid
-%5 = OpTypeFunction %6
-%10 = OpTypeBool
-)");
-  EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
-            R"(%11 = OpLoad %3 %1
-%12 = OpIsInf %10 %11
-%13 = OpIsNan %10 %11
-%14 = OpLogicalOr %10 %12 %13
-%9 = OpLogicalNot %10 %14
-OpReturn
-)");
-}
-
-TEST_F(BuiltinBuilderTest, IsFinite_Vector) {
-  auto* var = Global("v", ty.vec3<f32>(), ast::StorageClass::kPrivate);
-  auto* expr = Call("isFinite", "v");
-  auto* func = Func("a_func", {}, ty.void_(),
-                    {
-                        Assign(Phony(), expr),
-                    });
-
-  spirv::Builder& b = Build();
-
-  ASSERT_TRUE(b.GenerateGlobalVariable(var)) << b.error();
-  ASSERT_TRUE(b.GenerateFunction(func)) << b.error();
-
-  EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
-%3 = OpTypeVector %4 3
-%2 = OpTypePointer Private %3
-%5 = OpConstantNull %3
-%1 = OpVariable %2 Private %5
-%7 = OpTypeVoid
-%6 = OpTypeFunction %7
-%12 = OpTypeBool
-%11 = OpTypeVector %12 3
-)");
-  EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
-            R"(%13 = OpLoad %3 %1
-%14 = OpIsInf %11 %13
-%15 = OpIsNan %11 %13
-%16 = OpLogicalOr %11 %14 %15
-%10 = OpLogicalNot %11 %16
-OpReturn
-)");
-}
-
-TEST_F(BuiltinBuilderTest, IsNormal_Scalar) {
-  auto* var = Global("v", ty.f32(), ast::StorageClass::kPrivate);
-  auto* expr = Call("isNormal", "v");
-  auto* func = Func("a_func", {}, ty.void_(),
-                    {
-                        Assign(Phony(), expr),
-                    });
-
-  spirv::Builder& b = Build();
-
-  ASSERT_TRUE(b.GenerateGlobalVariable(var)) << b.error();
-  ASSERT_TRUE(b.GenerateFunction(func)) << b.error();
-
-  auto got = DumpBuilder(b);
-  EXPECT_EQ(got, R"(%12 = OpExtInstImport "GLSL.std.450"
-OpName %1 "v"
-OpName %7 "a_func"
-%3 = OpTypeFloat 32
-%2 = OpTypePointer Private %3
-%4 = OpConstantNull %3
-%1 = OpVariable %2 Private %4
-%6 = OpTypeVoid
-%5 = OpTypeFunction %6
-%10 = OpTypeBool
-%13 = OpTypeInt 32 0
-%14 = OpConstant %13 133693440
-%15 = OpConstant %13 524288
-%16 = OpConstant %13 133169152
-%7 = OpFunction %6 None %5
-%8 = OpLabel
-%11 = OpLoad %3 %1
-%17 = OpBitcast %13 %11
-%18 = OpBitwiseAnd %13 %17 %14
-%19 = OpExtInst %13 %12 UClamp %18 %15 %16
-%9 = OpIEqual %10 %18 %19
-OpReturn
-OpFunctionEnd
-)");
-}
-
-TEST_F(BuiltinBuilderTest, IsNormal_Vector) {
-  auto* var = Global("v", ty.vec2<f32>(), ast::StorageClass::kPrivate);
-  auto* expr = Call("isNormal", "v");
-  auto* func = Func("a_func", {}, ty.void_(),
-                    {
-                        Assign(Phony(), expr),
-                    });
-
-  spirv::Builder& b = Build();
-
-  ASSERT_TRUE(b.GenerateGlobalVariable(var)) << b.error();
-  ASSERT_TRUE(b.GenerateFunction(func)) << b.error();
-
-  auto got = DumpBuilder(b);
-  EXPECT_EQ(got, R"(%14 = OpExtInstImport "GLSL.std.450"
-OpName %1 "v"
-OpName %8 "a_func"
-%4 = OpTypeFloat 32
-%3 = OpTypeVector %4 2
-%2 = OpTypePointer Private %3
-%5 = OpConstantNull %3
-%1 = OpVariable %2 Private %5
-%7 = OpTypeVoid
-%6 = OpTypeFunction %7
-%12 = OpTypeBool
-%11 = OpTypeVector %12 2
-%15 = OpTypeInt 32 0
-%16 = OpConstant %15 133693440
-%17 = OpConstant %15 524288
-%18 = OpConstant %15 133169152
-%19 = OpTypeVector %15 2
-%8 = OpFunction %7 None %6
-%9 = OpLabel
-%13 = OpLoad %3 %1
-%20 = OpCompositeConstruct %19 %16 %16
-%21 = OpCompositeConstruct %19 %17 %17
-%22 = OpCompositeConstruct %19 %18 %18
-%23 = OpBitcast %19 %13
-%24 = OpBitwiseAnd %19 %23 %20
-%25 = OpExtInst %19 %14 UClamp %24 %21 %22
-%10 = OpIEqual %11 %24 %25
-OpReturn
-OpFunctionEnd
-)");
-}
-
 using BuiltinIntTest = BuiltinBuilderTestWithParam<BuiltinData>;
 TEST_P(BuiltinIntTest, Call_SInt_Scalar) {
   auto param = GetParam();
diff --git a/test/tint/bug/chromium/1273230.wgsl b/test/tint/bug/chromium/1273230.wgsl
index dad0cba..d2f0569 100644
--- a/test/tint/bug/chromium/1273230.wgsl
+++ b/test/tint/bug/chromium/1273230.wgsl
@@ -1,15 +1,10 @@
 // /fallthroUgh]
 fn marg8uintin() {
     _ = (0 );
-  _ = isNormal(4.);
 _ =   (vec4<f32>( 2.));
 
-  isNormal(vec4<f32>());
     _ =         (vec4<f32>( 2.));
 
-     isNormal(0.);
-    _ = isNormal(4.);
-    _ = isNormal(2.);
 
 }
 struct Uniforms {
diff --git a/test/tint/bug/chromium/1273230.wgsl.expected.glsl b/test/tint/bug/chromium/1273230.wgsl.expected.glsl
index dfd6196..5793189 100644
--- a/test/tint/bug/chromium/1273230.wgsl.expected.glsl
+++ b/test/tint/bug/chromium/1273230.wgsl.expected.glsl
@@ -1,23 +1,3 @@
-bug/chromium/1273230.wgsl:4:7 warning: use of deprecated builtin
-  _ = isNormal(4.);
-      ^^^^^^^^
-
-bug/chromium/1273230.wgsl:7:3 warning: use of deprecated builtin
-  isNormal(vec4<f32>());
-  ^^^^^^^^
-
-bug/chromium/1273230.wgsl:10:6 warning: use of deprecated builtin
-     isNormal(0.);
-     ^^^^^^^^
-
-bug/chromium/1273230.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(4.);
-        ^^^^^^^^
-
-bug/chromium/1273230.wgsl:12:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
 #version 310 es
 
 struct Uniforms {
diff --git a/test/tint/bug/chromium/1273230.wgsl.expected.hlsl b/test/tint/bug/chromium/1273230.wgsl.expected.hlsl
index b1b9cf0..5b6f132 100644
--- a/test/tint/bug/chromium/1273230.wgsl.expected.hlsl
+++ b/test/tint/bug/chromium/1273230.wgsl.expected.hlsl
@@ -1,35 +1,3 @@
-bug/chromium/1273230.wgsl:4:7 warning: use of deprecated builtin
-  _ = isNormal(4.);
-      ^^^^^^^^
-
-bug/chromium/1273230.wgsl:7:3 warning: use of deprecated builtin
-  isNormal(vec4<f32>());
-  ^^^^^^^^
-
-bug/chromium/1273230.wgsl:10:6 warning: use of deprecated builtin
-     isNormal(0.);
-     ^^^^^^^^
-
-bug/chromium/1273230.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(4.);
-        ^^^^^^^^
-
-bug/chromium/1273230.wgsl:12:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
-bool tint_isNormal(float param_0) {
-  uint exponent = asuint(param_0) & 0x7f80000;
-  uint clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
-bool4 tint_isNormal_1(float4 param_0) {
-  uint4 exponent = asuint(param_0) & 0x7f80000;
-  uint4 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
 uint value_or_one_if_zero_uint(uint value) {
   return value == 0u ? 1u : value;
 }
@@ -53,11 +21,6 @@
 }
 
 void marg8uintin() {
-  tint_isNormal(4.0f);
-  tint_isNormal_1(float4(0.0f, 0.0f, 0.0f, 0.0f));
-  tint_isNormal(0.0f);
-  tint_isNormal(4.0f);
-  tint_isNormal(2.0f);
 }
 
 cbuffer cbuffer_uniforms : register(b0, space0) {
diff --git a/test/tint/bug/chromium/1273230.wgsl.expected.msl b/test/tint/bug/chromium/1273230.wgsl.expected.msl
index 0d8e7e6..0052f59 100644
--- a/test/tint/bug/chromium/1273230.wgsl.expected.msl
+++ b/test/tint/bug/chromium/1273230.wgsl.expected.msl
@@ -1,23 +1,3 @@
-bug/chromium/1273230.wgsl:4:7 warning: use of deprecated builtin
-  _ = isNormal(4.);
-      ^^^^^^^^
-
-bug/chromium/1273230.wgsl:7:3 warning: use of deprecated builtin
-  isNormal(vec4<f32>());
-  ^^^^^^^^
-
-bug/chromium/1273230.wgsl:10:6 warning: use of deprecated builtin
-     isNormal(0.);
-     ^^^^^^^^
-
-bug/chromium/1273230.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(4.);
-        ^^^^^^^^
-
-bug/chromium/1273230.wgsl:12:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
 #include <metal_stdlib>
 
 using namespace metal;
@@ -33,11 +13,6 @@
 }
 
 void marg8uintin() {
-  isnormal(4.0f);
-  isnormal(float4());
-  isnormal(0.0f);
-  isnormal(4.0f);
-  isnormal(2.0f);
 }
 
 struct Uniforms {
diff --git a/test/tint/bug/chromium/1273230.wgsl.expected.spvasm b/test/tint/bug/chromium/1273230.wgsl.expected.spvasm
index a2c9d8c..71068d2 100644
--- a/test/tint/bug/chromium/1273230.wgsl.expected.spvasm
+++ b/test/tint/bug/chromium/1273230.wgsl.expected.spvasm
@@ -1,30 +1,10 @@
-bug/chromium/1273230.wgsl:4:7 warning: use of deprecated builtin
-  _ = isNormal(4.);
-      ^^^^^^^^
-
-bug/chromium/1273230.wgsl:7:3 warning: use of deprecated builtin
-  isNormal(vec4<f32>());
-  ^^^^^^^^
-
-bug/chromium/1273230.wgsl:10:6 warning: use of deprecated builtin
-     isNormal(0.);
-     ^^^^^^^^
-
-bug/chromium/1273230.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(4.);
-        ^^^^^^^^
-
-bug/chromium/1273230.wgsl:12:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 308
+; Bound: 277
 ; Schema: 0
                OpCapability Shader
-         %38 = OpExtInstImport "GLSL.std.450"
+         %71 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %main_count "main_count" %GlobalInvocationID_1
                OpExecutionMode %main_count LocalSize 128 1 1
@@ -186,323 +166,292 @@
        %void = OpTypeVoid
          %30 = OpTypeFunction %void
       %int_0 = OpConstant %int 0
-       %bool = OpTypeBool
-    %float_4 = OpConstant %float 4
-%uint_133693440 = OpConstant %uint 133693440
-%uint_524288 = OpConstant %uint 524288
-%uint_133169152 = OpConstant %uint 133169152
     %v4float = OpTypeVector %float 4
     %float_2 = OpConstant %float 2
-         %47 = OpConstantComposite %v4float %float_2 %float_2 %float_2 %float_2
-     %v4bool = OpTypeVector %bool 4
-         %50 = OpConstantNull %v4float
-     %v4uint = OpTypeVector %uint 4
-    %float_0 = OpConstant %float 0
-         %71 = OpTypeFunction %v3float %v3float
+         %37 = OpConstantComposite %v4float %float_2 %float_2 %float_2 %float_2
+         %38 = OpTypeFunction %v3float %v3float
      %uint_4 = OpConstant %uint 4
      %uint_0 = OpConstant %uint 0
 %_ptr_Uniform_float = OpTypePointer Uniform %float
      %uint_1 = OpConstant %uint 1
      %uint_2 = OpConstant %uint 2
 %_ptr_Function_v3float = OpTypePointer Function %v3float
-         %89 = OpConstantNull %v3float
+         %56 = OpConstantNull %v3float
      %uint_5 = OpConstant %uint 5
 %_ptr_Function_float = OpTypePointer Function %float
-        %113 = OpConstantNull %float
+         %81 = OpConstantNull %float
 %_ptr_Uniform_uint = OpTypePointer Uniform %uint
-        %150 = OpTypeFunction %uint %uint %v3float
+        %118 = OpTypeFunction %uint %uint %v3float
 %_ptr_Function_v3uint = OpTypePointer Function %v3uint
-        %158 = OpConstantNull %v3uint
+        %126 = OpConstantNull %v3uint
 %_ptr_Function_uint = OpTypePointer Function %uint
-        %171 = OpTypeFunction %v3uint %uint %uint
-        %179 = OpConstantNull %uint
-        %192 = OpTypeFunction %v3float %uint
+        %139 = OpTypeFunction %v3uint %uint %uint
+        %147 = OpConstantNull %uint
+        %160 = OpTypeFunction %v3float %uint
      %uint_3 = OpConstant %uint 3
 %_ptr_StorageBuffer_float = OpTypePointer StorageBuffer %float
 %_ptr_StorageBuffer_uint = OpTypePointer StorageBuffer %uint
 %_ptr_StorageBuffer_uint_0 = OpTypePointer StorageBuffer %uint
 %_ptr_StorageBuffer_int = OpTypePointer StorageBuffer %int
 %_ptr_Function_int = OpTypePointer Function %int
-        %239 = OpConstantNull %int
-        %240 = OpTypeFunction %void %v3uint
+        %207 = OpConstantNull %int
+        %208 = OpTypeFunction %void %v3uint
+       %bool = OpTypeBool
     %float_3 = OpConstant %float 3
       %int_1 = OpConstant %int 1
 %marg8uintin = OpFunction %void None %30
          %33 = OpLabel
-         %42 = OpBitcast %uint %float_4
-         %43 = OpBitwiseAnd %uint %42 %uint_133693440
-         %44 = OpExtInst %uint %38 UClamp %43 %uint_524288 %uint_133169152
-         %35 = OpIEqual %bool %43 %44
-         %52 = OpCompositeConstruct %v4uint %uint_133693440 %uint_133693440 %uint_133693440 %uint_133693440
-         %53 = OpCompositeConstruct %v4uint %uint_524288 %uint_524288 %uint_524288 %uint_524288
-         %54 = OpCompositeConstruct %v4uint %uint_133169152 %uint_133169152 %uint_133169152 %uint_133169152
-         %55 = OpBitcast %v4uint %50
-         %56 = OpBitwiseAnd %v4uint %55 %52
-         %57 = OpExtInst %v4uint %38 UClamp %56 %53 %54
-         %48 = OpIEqual %v4bool %56 %57
-         %60 = OpBitcast %uint %float_0
-         %61 = OpBitwiseAnd %uint %60 %uint_133693440
-         %62 = OpExtInst %uint %38 UClamp %61 %uint_524288 %uint_133169152
-         %58 = OpIEqual %bool %61 %62
-         %64 = OpBitcast %uint %float_4
-         %65 = OpBitwiseAnd %uint %64 %uint_133693440
-         %66 = OpExtInst %uint %38 UClamp %65 %uint_524288 %uint_133169152
-         %63 = OpIEqual %bool %65 %66
-         %68 = OpBitcast %uint %float_2
-         %69 = OpBitwiseAnd %uint %68 %uint_133693440
-         %70 = OpExtInst %uint %38 UClamp %69 %uint_524288 %uint_133169152
-         %67 = OpIEqual %bool %69 %70
                OpReturn
                OpFunctionEnd
- %toVoxelPos = OpFunction %v3float None %71
+ %toVoxelPos = OpFunction %v3float None %38
    %position = OpFunctionParameter %v3float
-         %74 = OpLabel
-      %bbMin = OpVariable %_ptr_Function_v3float Function %89
-      %bbMax = OpVariable %_ptr_Function_v3float Function %89
-     %bbSize = OpVariable %_ptr_Function_v3float Function %89
-   %cubeSize = OpVariable %_ptr_Function_float Function %113
-   %gridSize = OpVariable %_ptr_Function_float Function %113
-         %gx = OpVariable %_ptr_Function_float Function %113
-         %gy = OpVariable %_ptr_Function_float Function %113
-         %gz = OpVariable %_ptr_Function_float Function %113
-         %78 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_0
+         %41 = OpLabel
+      %bbMin = OpVariable %_ptr_Function_v3float Function %56
+      %bbMax = OpVariable %_ptr_Function_v3float Function %56
+     %bbSize = OpVariable %_ptr_Function_v3float Function %56
+   %cubeSize = OpVariable %_ptr_Function_float Function %81
+   %gridSize = OpVariable %_ptr_Function_float Function %81
+         %gx = OpVariable %_ptr_Function_float Function %81
+         %gy = OpVariable %_ptr_Function_float Function %81
+         %gz = OpVariable %_ptr_Function_float Function %81
+         %45 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_0
+         %46 = OpLoad %float %45
+         %48 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_1
+         %49 = OpLoad %float %48
+         %51 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_2
+         %52 = OpLoad %float %51
+         %53 = OpCompositeConstruct %v3float %46 %49 %52
+               OpStore %bbMin %53
+         %58 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_5 %uint_0
+         %59 = OpLoad %float %58
+         %60 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_5 %uint_1
+         %61 = OpLoad %float %60
+         %62 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_5 %uint_2
+         %63 = OpLoad %float %62
+         %64 = OpCompositeConstruct %v3float %59 %61 %63
+               OpStore %bbMax %64
+         %66 = OpLoad %v3float %bbMin
+         %67 = OpLoad %v3float %bbMin
+         %68 = OpFSub %v3float %66 %67
+               OpStore %bbSize %68
+         %74 = OpAccessChain %_ptr_Function_float %bbMax %uint_0
+         %75 = OpLoad %float %74
+         %76 = OpAccessChain %_ptr_Function_float %bbMax %uint_1
+         %77 = OpLoad %float %76
+         %72 = OpExtInst %float %71 NMax %75 %77
+         %78 = OpAccessChain %_ptr_Function_float %bbSize %uint_2
          %79 = OpLoad %float %78
-         %81 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_1
-         %82 = OpLoad %float %81
-         %84 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_2
-         %85 = OpLoad %float %84
-         %86 = OpCompositeConstruct %v3float %79 %82 %85
-               OpStore %bbMin %86
-         %91 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_5 %uint_0
-         %92 = OpLoad %float %91
-         %93 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_5 %uint_1
-         %94 = OpLoad %float %93
-         %95 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_5 %uint_2
-         %96 = OpLoad %float %95
-         %97 = OpCompositeConstruct %v3float %92 %94 %96
-               OpStore %bbMax %97
-         %99 = OpLoad %v3float %bbMin
-        %100 = OpLoad %v3float %bbMin
-        %101 = OpFSub %v3float %99 %100
-               OpStore %bbSize %101
-        %106 = OpAccessChain %_ptr_Function_float %bbMax %uint_0
-        %107 = OpLoad %float %106
-        %108 = OpAccessChain %_ptr_Function_float %bbMax %uint_1
-        %109 = OpLoad %float %108
-        %104 = OpExtInst %float %38 NMax %107 %109
-        %110 = OpAccessChain %_ptr_Function_float %bbSize %uint_2
-        %111 = OpLoad %float %110
-        %103 = OpExtInst %float %38 NMax %104 %111
-               OpStore %cubeSize %103
-        %116 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_1
-        %117 = OpLoad %uint %116
-        %114 = OpConvertUToF %float %117
-               OpStore %gridSize %114
-        %119 = OpLoad %float %cubeSize
-        %120 = OpCompositeExtract %float %position 0
-        %121 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_0
-        %122 = OpLoad %float %121
-        %123 = OpFSub %float %120 %122
-        %124 = OpFMul %float %119 %123
-        %125 = OpLoad %float %cubeSize
-        %126 = OpFDiv %float %124 %125
-               OpStore %gx %126
-        %128 = OpLoad %float %gx
-        %129 = OpCompositeExtract %float %position 1
-        %130 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_1
-        %131 = OpLoad %float %130
-        %132 = OpFSub %float %129 %131
-        %133 = OpFMul %float %128 %132
-        %134 = OpLoad %float %gridSize
-        %135 = OpFDiv %float %133 %134
-               OpStore %gy %135
-        %137 = OpLoad %float %gridSize
-        %138 = OpCompositeExtract %float %position 2
-        %139 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_2
-        %140 = OpLoad %float %139
-        %141 = OpFSub %float %138 %140
-        %142 = OpFMul %float %137 %141
-        %143 = OpLoad %float %gridSize
-        %144 = OpFDiv %float %142 %143
-               OpStore %gz %144
-        %146 = OpLoad %float %gz
-        %147 = OpLoad %float %gz
-        %148 = OpLoad %float %gz
-        %149 = OpCompositeConstruct %v3float %146 %147 %148
-               OpReturnValue %149
+         %70 = OpExtInst %float %71 NMax %72 %79
+               OpStore %cubeSize %70
+         %84 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_1
+         %85 = OpLoad %uint %84
+         %82 = OpConvertUToF %float %85
+               OpStore %gridSize %82
+         %87 = OpLoad %float %cubeSize
+         %88 = OpCompositeExtract %float %position 0
+         %89 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_0
+         %90 = OpLoad %float %89
+         %91 = OpFSub %float %88 %90
+         %92 = OpFMul %float %87 %91
+         %93 = OpLoad %float %cubeSize
+         %94 = OpFDiv %float %92 %93
+               OpStore %gx %94
+         %96 = OpLoad %float %gx
+         %97 = OpCompositeExtract %float %position 1
+         %98 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_1
+         %99 = OpLoad %float %98
+        %100 = OpFSub %float %97 %99
+        %101 = OpFMul %float %96 %100
+        %102 = OpLoad %float %gridSize
+        %103 = OpFDiv %float %101 %102
+               OpStore %gy %103
+        %105 = OpLoad %float %gridSize
+        %106 = OpCompositeExtract %float %position 2
+        %107 = OpAccessChain %_ptr_Uniform_float %uniforms %uint_4 %uint_2
+        %108 = OpLoad %float %107
+        %109 = OpFSub %float %106 %108
+        %110 = OpFMul %float %105 %109
+        %111 = OpLoad %float %gridSize
+        %112 = OpFDiv %float %110 %111
+               OpStore %gz %112
+        %114 = OpLoad %float %gz
+        %115 = OpLoad %float %gz
+        %116 = OpLoad %float %gz
+        %117 = OpCompositeConstruct %v3float %114 %115 %116
+               OpReturnValue %117
                OpFunctionEnd
-  %toIndex1D = OpFunction %uint None %150
+  %toIndex1D = OpFunction %uint None %118
  %gridSize_0 = OpFunctionParameter %uint
    %voxelPos = OpFunctionParameter %v3float
-        %154 = OpLabel
-     %icoord = OpVariable %_ptr_Function_v3uint Function %158
-        %155 = OpConvertFToU %v3uint %voxelPos
-               OpStore %icoord %155
-        %160 = OpAccessChain %_ptr_Function_uint %icoord %uint_0
-        %161 = OpLoad %uint %160
-        %162 = OpAccessChain %_ptr_Function_uint %icoord %uint_1
-        %163 = OpLoad %uint %162
-        %164 = OpIMul %uint %gridSize_0 %163
-        %165 = OpIAdd %uint %161 %164
-        %166 = OpIMul %uint %gridSize_0 %gridSize_0
-        %167 = OpAccessChain %_ptr_Function_uint %icoord %uint_2
-        %168 = OpLoad %uint %167
-        %169 = OpIMul %uint %166 %168
-        %170 = OpIAdd %uint %165 %169
-               OpReturnValue %170
+        %122 = OpLabel
+     %icoord = OpVariable %_ptr_Function_v3uint Function %126
+        %123 = OpConvertFToU %v3uint %voxelPos
+               OpStore %icoord %123
+        %128 = OpAccessChain %_ptr_Function_uint %icoord %uint_0
+        %129 = OpLoad %uint %128
+        %130 = OpAccessChain %_ptr_Function_uint %icoord %uint_1
+        %131 = OpLoad %uint %130
+        %132 = OpIMul %uint %gridSize_0 %131
+        %133 = OpIAdd %uint %129 %132
+        %134 = OpIMul %uint %gridSize_0 %gridSize_0
+        %135 = OpAccessChain %_ptr_Function_uint %icoord %uint_2
+        %136 = OpLoad %uint %135
+        %137 = OpIMul %uint %134 %136
+        %138 = OpIAdd %uint %133 %137
+               OpReturnValue %138
                OpFunctionEnd
-  %toIndex4D = OpFunction %v3uint None %171
+  %toIndex4D = OpFunction %v3uint None %139
  %gridSize_1 = OpFunctionParameter %uint
       %index = OpFunctionParameter %uint
-        %175 = OpLabel
-          %z = OpVariable %_ptr_Function_uint Function %179
-          %y = OpVariable %_ptr_Function_uint Function %179
-          %x = OpVariable %_ptr_Function_uint Function %179
-        %176 = OpIMul %uint %index %index
-        %177 = OpUDiv %uint %gridSize_1 %176
-               OpStore %z %177
-        %180 = OpIMul %uint %gridSize_1 %gridSize_1
-        %181 = OpLoad %uint %z
-        %182 = OpIMul %uint %180 %181
-        %183 = OpISub %uint %gridSize_1 %182
-        %184 = OpUDiv %uint %183 %gridSize_1
-               OpStore %y %184
-        %186 = OpUMod %uint %index %gridSize_1
-               OpStore %x %186
-        %188 = OpLoad %uint %z
-        %189 = OpLoad %uint %y
-        %190 = OpLoad %uint %y
-        %191 = OpCompositeConstruct %v3uint %188 %189 %190
-               OpReturnValue %191
+        %143 = OpLabel
+          %z = OpVariable %_ptr_Function_uint Function %147
+          %y = OpVariable %_ptr_Function_uint Function %147
+          %x = OpVariable %_ptr_Function_uint Function %147
+        %144 = OpIMul %uint %index %index
+        %145 = OpUDiv %uint %gridSize_1 %144
+               OpStore %z %145
+        %148 = OpIMul %uint %gridSize_1 %gridSize_1
+        %149 = OpLoad %uint %z
+        %150 = OpIMul %uint %148 %149
+        %151 = OpISub %uint %gridSize_1 %150
+        %152 = OpUDiv %uint %151 %gridSize_1
+               OpStore %y %152
+        %154 = OpUMod %uint %index %gridSize_1
+               OpStore %x %154
+        %156 = OpLoad %uint %z
+        %157 = OpLoad %uint %y
+        %158 = OpLoad %uint %y
+        %159 = OpCompositeConstruct %v3uint %156 %157 %158
+               OpReturnValue %159
                OpFunctionEnd
-%loadPosition = OpFunction %v3float None %192
+%loadPosition = OpFunction %v3float None %160
 %vertexIndex = OpFunctionParameter %uint
-        %195 = OpLabel
- %position_0 = OpVariable %_ptr_Function_v3float Function %89
-        %197 = OpIMul %uint %uint_3 %vertexIndex
-        %198 = OpIAdd %uint %197 %uint_0
-        %200 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %198
-        %201 = OpLoad %float %200
-        %202 = OpIMul %uint %uint_3 %vertexIndex
-        %203 = OpIAdd %uint %202 %uint_1
-        %204 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %203
-        %205 = OpLoad %float %204
-        %206 = OpIMul %uint %uint_3 %vertexIndex
-        %207 = OpIAdd %uint %206 %uint_2
-        %208 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %207
-        %209 = OpLoad %float %208
-        %210 = OpCompositeConstruct %v3float %201 %205 %209
-               OpStore %position_0 %210
-        %212 = OpLoad %v3float %position_0
-               OpReturnValue %212
+        %163 = OpLabel
+ %position_0 = OpVariable %_ptr_Function_v3float Function %56
+        %165 = OpIMul %uint %uint_3 %vertexIndex
+        %166 = OpIAdd %uint %165 %uint_0
+        %168 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %166
+        %169 = OpLoad %float %168
+        %170 = OpIMul %uint %uint_3 %vertexIndex
+        %171 = OpIAdd %uint %170 %uint_1
+        %172 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %171
+        %173 = OpLoad %float %172
+        %174 = OpIMul %uint %uint_3 %vertexIndex
+        %175 = OpIAdd %uint %174 %uint_2
+        %176 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %175
+        %177 = OpLoad %float %176
+        %178 = OpCompositeConstruct %v3float %169 %173 %177
+               OpStore %position_0 %178
+        %180 = OpLoad %v3float %position_0
+               OpReturnValue %180
                OpFunctionEnd
    %doIgnore = OpFunction %void None %30
-        %214 = OpLabel
-        %g43 = OpVariable %_ptr_Function_uint Function %179
-        %kj6 = OpVariable %_ptr_Function_uint Function %179
-        %b53 = OpVariable %_ptr_Function_uint Function %179
-        %rwg = OpVariable %_ptr_Function_uint Function %179
-        %rb5 = OpVariable %_ptr_Function_float Function %113
-        %g55 = OpVariable %_ptr_Function_int Function %239
-        %215 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_0
-        %216 = OpLoad %uint %215
-               OpStore %g43 %216
-        %219 = OpAccessChain %_ptr_StorageBuffer_uint %dbg %uint_5
-        %220 = OpLoad %uint %219
-               OpStore %kj6 %220
-        %225 = OpAccessChain %_ptr_StorageBuffer_uint_0 %counters %uint_0 %int_0
-        %222 = OpAtomicLoad %uint %225 %uint_1 %uint_0
-               OpStore %b53 %222
-        %227 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %int_0
-        %228 = OpLoad %uint %227
-               OpStore %rwg %228
-        %230 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %int_0
-        %231 = OpLoad %float %230
-               OpStore %rb5 %231
-        %236 = OpAccessChain %_ptr_StorageBuffer_int %LUT %uint_0 %int_0
-        %233 = OpAtomicLoad %int %236 %uint_1 %uint_0
-               OpStore %g55 %233
+        %182 = OpLabel
+        %g43 = OpVariable %_ptr_Function_uint Function %147
+        %kj6 = OpVariable %_ptr_Function_uint Function %147
+        %b53 = OpVariable %_ptr_Function_uint Function %147
+        %rwg = OpVariable %_ptr_Function_uint Function %147
+        %rb5 = OpVariable %_ptr_Function_float Function %81
+        %g55 = OpVariable %_ptr_Function_int Function %207
+        %183 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_0
+        %184 = OpLoad %uint %183
+               OpStore %g43 %184
+        %187 = OpAccessChain %_ptr_StorageBuffer_uint %dbg %uint_5
+        %188 = OpLoad %uint %187
+               OpStore %kj6 %188
+        %193 = OpAccessChain %_ptr_StorageBuffer_uint_0 %counters %uint_0 %int_0
+        %190 = OpAtomicLoad %uint %193 %uint_1 %uint_0
+               OpStore %b53 %190
+        %195 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %int_0
+        %196 = OpLoad %uint %195
+               OpStore %rwg %196
+        %198 = OpAccessChain %_ptr_StorageBuffer_float %positions %uint_0 %int_0
+        %199 = OpLoad %float %198
+               OpStore %rb5 %199
+        %204 = OpAccessChain %_ptr_StorageBuffer_int %LUT %uint_0 %int_0
+        %201 = OpAtomicLoad %int %204 %uint_1 %uint_0
+               OpStore %g55 %201
                OpReturn
                OpFunctionEnd
-%main_count_inner = OpFunction %void None %240
+%main_count_inner = OpFunction %void None %208
 %GlobalInvocationID = OpFunctionParameter %v3uint
-        %243 = OpLabel
-%triangleIndex = OpVariable %_ptr_Function_uint Function %179
-         %i0 = OpVariable %_ptr_Function_uint Function %179
-         %i1 = OpVariable %_ptr_Function_uint Function %179
-         %i2 = OpVariable %_ptr_Function_uint Function %179
-         %p0 = OpVariable %_ptr_Function_v3float Function %89
-         %p1 = OpVariable %_ptr_Function_v3float Function %89
-         %p2 = OpVariable %_ptr_Function_v3float Function %89
-        %287 = OpVariable %_ptr_Function_v3float Function %89
-     %center = OpVariable %_ptr_Function_v3float Function %89
- %voxelPos_0 = OpVariable %_ptr_Function_v3float Function %89
-     %lIndex = OpVariable %_ptr_Function_uint Function %179
-%triangleOffset = OpVariable %_ptr_Function_int Function %239
-        %244 = OpCompositeExtract %uint %GlobalInvocationID 0
-               OpStore %triangleIndex %244
-        %246 = OpLoad %uint %triangleIndex
-        %247 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_0
-        %248 = OpLoad %uint %247
-        %249 = OpUGreaterThanEqual %bool %246 %248
-               OpSelectionMerge %250 None
-               OpBranchConditional %249 %251 %250
-        %251 = OpLabel
+        %211 = OpLabel
+%triangleIndex = OpVariable %_ptr_Function_uint Function %147
+         %i0 = OpVariable %_ptr_Function_uint Function %147
+         %i1 = OpVariable %_ptr_Function_uint Function %147
+         %i2 = OpVariable %_ptr_Function_uint Function %147
+         %p0 = OpVariable %_ptr_Function_v3float Function %56
+         %p1 = OpVariable %_ptr_Function_v3float Function %56
+         %p2 = OpVariable %_ptr_Function_v3float Function %56
+        %256 = OpVariable %_ptr_Function_v3float Function %56
+     %center = OpVariable %_ptr_Function_v3float Function %56
+ %voxelPos_0 = OpVariable %_ptr_Function_v3float Function %56
+     %lIndex = OpVariable %_ptr_Function_uint Function %147
+%triangleOffset = OpVariable %_ptr_Function_int Function %207
+        %212 = OpCompositeExtract %uint %GlobalInvocationID 0
+               OpStore %triangleIndex %212
+        %214 = OpLoad %uint %triangleIndex
+        %215 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_0
+        %216 = OpLoad %uint %215
+        %217 = OpUGreaterThanEqual %bool %214 %216
+               OpSelectionMerge %219 None
+               OpBranchConditional %217 %220 %219
+        %220 = OpLabel
                OpReturn
-        %250 = OpLabel
-        %252 = OpFunctionCall %void %doIgnore
-        %253 = OpLoad %uint %triangleIndex
-        %254 = OpIMul %uint %uint_3 %253
-        %255 = OpIAdd %uint %254 %uint_0
-        %256 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %255
-        %257 = OpLoad %uint %256
-               OpStore %i0 %257
-        %259 = OpLoad %uint %i0
-        %260 = OpIMul %uint %uint_3 %259
-        %261 = OpIAdd %uint %260 %uint_1
-        %262 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %261
-        %263 = OpLoad %uint %262
-               OpStore %i1 %263
-        %265 = OpLoad %uint %i0
-        %266 = OpIMul %uint %uint_3 %265
-        %267 = OpIAdd %uint %266 %uint_2
-        %268 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %267
-        %269 = OpLoad %uint %268
-               OpStore %i2 %269
-        %272 = OpLoad %uint %i0
-        %271 = OpFunctionCall %v3float %loadPosition %272
-               OpStore %p0 %271
-        %275 = OpLoad %uint %i0
-        %274 = OpFunctionCall %v3float %loadPosition %275
-               OpStore %p1 %274
-        %278 = OpLoad %uint %i2
-        %277 = OpFunctionCall %v3float %loadPosition %278
-               OpStore %p2 %277
-        %280 = OpLoad %v3float %p0
-        %281 = OpLoad %v3float %p2
-        %282 = OpFAdd %v3float %280 %281
-        %283 = OpLoad %v3float %p1
-        %284 = OpFAdd %v3float %282 %283
-        %288 = OpCompositeConstruct %v3float %float_3 %float_3 %float_3
-        %286 = OpFDiv %v3float %284 %288
-               OpStore %center %286
-        %291 = OpLoad %v3float %p1
-        %290 = OpFunctionCall %v3float %toVoxelPos %291
-               OpStore %voxelPos_0 %290
-        %294 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_1
-        %295 = OpLoad %uint %294
-        %296 = OpLoad %v3float %p0
-        %293 = OpFunctionCall %uint %toIndex1D %295 %296
-               OpStore %lIndex %293
-        %300 = OpLoad %uint %i1
-        %301 = OpAccessChain %_ptr_StorageBuffer_int %LUT %uint_0 %300
-        %298 = OpAtomicIAdd %int %301 %uint_1 %uint_0 %int_1
-               OpStore %triangleOffset %298
+        %219 = OpLabel
+        %221 = OpFunctionCall %void %doIgnore
+        %222 = OpLoad %uint %triangleIndex
+        %223 = OpIMul %uint %uint_3 %222
+        %224 = OpIAdd %uint %223 %uint_0
+        %225 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %224
+        %226 = OpLoad %uint %225
+               OpStore %i0 %226
+        %228 = OpLoad %uint %i0
+        %229 = OpIMul %uint %uint_3 %228
+        %230 = OpIAdd %uint %229 %uint_1
+        %231 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %230
+        %232 = OpLoad %uint %231
+               OpStore %i1 %232
+        %234 = OpLoad %uint %i0
+        %235 = OpIMul %uint %uint_3 %234
+        %236 = OpIAdd %uint %235 %uint_2
+        %237 = OpAccessChain %_ptr_StorageBuffer_uint %indices %uint_0 %236
+        %238 = OpLoad %uint %237
+               OpStore %i2 %238
+        %241 = OpLoad %uint %i0
+        %240 = OpFunctionCall %v3float %loadPosition %241
+               OpStore %p0 %240
+        %244 = OpLoad %uint %i0
+        %243 = OpFunctionCall %v3float %loadPosition %244
+               OpStore %p1 %243
+        %247 = OpLoad %uint %i2
+        %246 = OpFunctionCall %v3float %loadPosition %247
+               OpStore %p2 %246
+        %249 = OpLoad %v3float %p0
+        %250 = OpLoad %v3float %p2
+        %251 = OpFAdd %v3float %249 %250
+        %252 = OpLoad %v3float %p1
+        %253 = OpFAdd %v3float %251 %252
+        %257 = OpCompositeConstruct %v3float %float_3 %float_3 %float_3
+        %255 = OpFDiv %v3float %253 %257
+               OpStore %center %255
+        %260 = OpLoad %v3float %p1
+        %259 = OpFunctionCall %v3float %toVoxelPos %260
+               OpStore %voxelPos_0 %259
+        %263 = OpAccessChain %_ptr_Uniform_uint %uniforms %uint_1
+        %264 = OpLoad %uint %263
+        %265 = OpLoad %v3float %p0
+        %262 = OpFunctionCall %uint %toIndex1D %264 %265
+               OpStore %lIndex %262
+        %269 = OpLoad %uint %i1
+        %270 = OpAccessChain %_ptr_StorageBuffer_int %LUT %uint_0 %269
+        %267 = OpAtomicIAdd %int %270 %uint_1 %uint_0 %int_1
+               OpStore %triangleOffset %267
                OpReturn
                OpFunctionEnd
  %main_count = OpFunction %void None %30
-        %305 = OpLabel
-        %307 = OpLoad %v3uint %GlobalInvocationID_1
-        %306 = OpFunctionCall %void %main_count_inner %307
+        %274 = OpLabel
+        %276 = OpLoad %v3uint %GlobalInvocationID_1
+        %275 = OpFunctionCall %void %main_count_inner %276
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/bug/chromium/1273230.wgsl.expected.wgsl b/test/tint/bug/chromium/1273230.wgsl.expected.wgsl
index 3e387da..2ca3277 100644
--- a/test/tint/bug/chromium/1273230.wgsl.expected.wgsl
+++ b/test/tint/bug/chromium/1273230.wgsl.expected.wgsl
@@ -1,32 +1,7 @@
-bug/chromium/1273230.wgsl:4:7 warning: use of deprecated builtin
-  _ = isNormal(4.);
-      ^^^^^^^^
-
-bug/chromium/1273230.wgsl:7:3 warning: use of deprecated builtin
-  isNormal(vec4<f32>());
-  ^^^^^^^^
-
-bug/chromium/1273230.wgsl:10:6 warning: use of deprecated builtin
-     isNormal(0.);
-     ^^^^^^^^
-
-bug/chromium/1273230.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(4.);
-        ^^^^^^^^
-
-bug/chromium/1273230.wgsl:12:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
 fn marg8uintin() {
   _ = 0;
-  _ = isNormal(4.0);
   _ = vec4<f32>(2.0);
-  isNormal(vec4<f32>());
   _ = vec4<f32>(2.0);
-  isNormal(0.0);
-  _ = isNormal(4.0);
-  _ = isNormal(2.0);
 }
 
 struct Uniforms {
diff --git a/test/tint/builtins/gen/isFinite/34d32b.wgsl b/test/tint/builtins/gen/isFinite/34d32b.wgsl
deleted file mode 100644
index 90950d2..0000000
--- a/test/tint/builtins/gen/isFinite/34d32b.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isFinite(vec<2, f32>) -> vec<2, bool>
-fn isFinite_34d32b() {
-  var res: vec2<bool> = isFinite(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_34d32b();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_34d32b();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_34d32b();
-}
diff --git a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.glsl b/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.glsl
deleted file mode 100644
index 68b02e8..0000000
--- a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.glsl
+++ /dev/null
@@ -1,78 +0,0 @@
-SKIP: FAILED
-
-builtins/gen/isFinite/34d32b.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isFinite(vec2<f32>());
-                        ^^^^^^^^
-
-#version 310 es
-
-void isFinite_34d32b() {
-  bvec2 res = isfinite(vec2(0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isFinite_34d32b();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp 2-component vector of bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-precision mediump float;
-
-void isFinite_34d32b() {
-  bvec2 res = isfinite(vec2(0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isFinite_34d32b();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:5: 'isfinite' : no matching overloaded function found 
-ERROR: 0:5: '=' :  cannot convert from ' const float' to ' temp 2-component vector of bool'
-ERROR: 0:5: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-
-void isFinite_34d32b() {
-  bvec2 res = isfinite(vec2(0.0f, 0.0f));
-}
-
-void compute_main() {
-  isFinite_34d32b();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp 2-component vector of bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
diff --git a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.hlsl b/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.hlsl
deleted file mode 100644
index 4301e88..0000000
--- a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isFinite/34d32b.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isFinite(vec2<f32>());
-                        ^^^^^^^^
-
-void isFinite_34d32b() {
-  bool2 res = isfinite(float2(0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isFinite_34d32b();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isFinite_34d32b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isFinite_34d32b();
-  return;
-}
diff --git a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.msl b/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.msl
deleted file mode 100644
index d0ef43d..0000000
--- a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isFinite/34d32b.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isFinite(vec2<f32>());
-                        ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isFinite_34d32b() {
-  bool2 res = isfinite(float2());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isFinite_34d32b();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isFinite_34d32b();
-  return;
-}
-
-kernel void compute_main() {
-  isFinite_34d32b();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.spvasm b/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.spvasm
deleted file mode 100644
index f33dc85..0000000
--- a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-builtins/gen/isFinite/34d32b.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isFinite(vec2<f32>());
-                        ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isFinite_34d32b "isFinite_34d32b"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v2bool = OpTypeVector %bool 2
-    %v2float = OpTypeVector %float 2
-         %17 = OpConstantNull %v2float
-%_ptr_Function_v2bool = OpTypePointer Function %v2bool
-         %23 = OpConstantNull %v2bool
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isFinite_34d32b = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v2bool Function %23
-         %18 = OpIsInf %v2bool %17
-         %19 = OpIsNan %v2bool %17
-         %20 = OpLogicalOr %v2bool %18 %19
-         %13 = OpLogicalNot %v2bool %20
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %isFinite_34d32b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isFinite_34d32b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %isFinite_34d32b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.wgsl b/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.wgsl
deleted file mode 100644
index 17242cf..0000000
--- a/test/tint/builtins/gen/isFinite/34d32b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isFinite/34d32b.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isFinite(vec2<f32>());
-                        ^^^^^^^^
-
-fn isFinite_34d32b() {
-  var res : vec2<bool> = isFinite(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_34d32b();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_34d32b();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_34d32b();
-}
diff --git a/test/tint/builtins/gen/isFinite/426f9f.wgsl b/test/tint/builtins/gen/isFinite/426f9f.wgsl
deleted file mode 100644
index 0f9dd1e..0000000
--- a/test/tint/builtins/gen/isFinite/426f9f.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isFinite(f32) -> bool
-fn isFinite_426f9f() {
-  var res: bool = isFinite(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_426f9f();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_426f9f();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_426f9f();
-}
diff --git a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.glsl b/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.glsl
deleted file mode 100644
index 057f0c1..0000000
--- a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.glsl
+++ /dev/null
@@ -1,78 +0,0 @@
-SKIP: FAILED
-
-builtins/gen/isFinite/426f9f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isFinite(1.0);
-                  ^^^^^^^^
-
-#version 310 es
-
-void isFinite_426f9f() {
-  bool res = isfinite(1.0f);
-}
-
-vec4 vertex_main() {
-  isFinite_426f9f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-precision mediump float;
-
-void isFinite_426f9f() {
-  bool res = isfinite(1.0f);
-}
-
-void fragment_main() {
-  isFinite_426f9f();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:5: 'isfinite' : no matching overloaded function found 
-ERROR: 0:5: '=' :  cannot convert from ' const float' to ' temp bool'
-ERROR: 0:5: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-
-void isFinite_426f9f() {
-  bool res = isfinite(1.0f);
-}
-
-void compute_main() {
-  isFinite_426f9f();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
diff --git a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.hlsl b/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.hlsl
deleted file mode 100644
index 8ba2451..0000000
--- a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isFinite/426f9f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isFinite(1.0);
-                  ^^^^^^^^
-
-void isFinite_426f9f() {
-  bool res = isfinite(1.0f);
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isFinite_426f9f();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isFinite_426f9f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isFinite_426f9f();
-  return;
-}
diff --git a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.msl b/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.msl
deleted file mode 100644
index 90997f8..0000000
--- a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isFinite/426f9f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isFinite(1.0);
-                  ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isFinite_426f9f() {
-  bool res = isfinite(1.0f);
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isFinite_426f9f();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isFinite_426f9f();
-  return;
-}
-
-kernel void compute_main() {
-  isFinite_426f9f();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.spvasm b/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.spvasm
deleted file mode 100644
index 6e64e7e..0000000
--- a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isFinite/426f9f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isFinite(1.0);
-                  ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 35
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isFinite_426f9f "isFinite_426f9f"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-    %float_1 = OpConstant %float 1
-%_ptr_Function_bool = OpTypePointer Function %bool
-         %21 = OpConstantNull %bool
-         %22 = OpTypeFunction %v4float
-%isFinite_426f9f = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_bool Function %21
-         %16 = OpIsInf %bool %float_1
-         %17 = OpIsNan %bool %float_1
-         %18 = OpLogicalOr %bool %16 %17
-         %13 = OpLogicalNot %bool %18
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %isFinite_426f9f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %isFinite_426f9f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isFinite_426f9f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.wgsl b/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.wgsl
deleted file mode 100644
index c532c74..0000000
--- a/test/tint/builtins/gen/isFinite/426f9f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isFinite/426f9f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isFinite(1.0);
-                  ^^^^^^^^
-
-fn isFinite_426f9f() {
-  var res : bool = isFinite(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_426f9f();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_426f9f();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_426f9f();
-}
diff --git a/test/tint/builtins/gen/isFinite/8a23ad.wgsl b/test/tint/builtins/gen/isFinite/8a23ad.wgsl
deleted file mode 100644
index f4b54ec..0000000
--- a/test/tint/builtins/gen/isFinite/8a23ad.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isFinite(vec<3, f32>) -> vec<3, bool>
-fn isFinite_8a23ad() {
-  var res: vec3<bool> = isFinite(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_8a23ad();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_8a23ad();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_8a23ad();
-}
diff --git a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.glsl b/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.glsl
deleted file mode 100644
index fe60f01..0000000
--- a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.glsl
+++ /dev/null
@@ -1,78 +0,0 @@
-SKIP: FAILED
-
-builtins/gen/isFinite/8a23ad.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isFinite(vec3<f32>());
-                        ^^^^^^^^
-
-#version 310 es
-
-void isFinite_8a23ad() {
-  bvec3 res = isfinite(vec3(0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isFinite_8a23ad();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp 3-component vector of bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-precision mediump float;
-
-void isFinite_8a23ad() {
-  bvec3 res = isfinite(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isFinite_8a23ad();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:5: 'isfinite' : no matching overloaded function found 
-ERROR: 0:5: '=' :  cannot convert from ' const float' to ' temp 3-component vector of bool'
-ERROR: 0:5: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-
-void isFinite_8a23ad() {
-  bvec3 res = isfinite(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isFinite_8a23ad();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp 3-component vector of bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
diff --git a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.hlsl b/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.hlsl
deleted file mode 100644
index b61ed9a..0000000
--- a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isFinite/8a23ad.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isFinite(vec3<f32>());
-                        ^^^^^^^^
-
-void isFinite_8a23ad() {
-  bool3 res = isfinite(float3(0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isFinite_8a23ad();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isFinite_8a23ad();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isFinite_8a23ad();
-  return;
-}
diff --git a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.msl b/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.msl
deleted file mode 100644
index 8a45c71..0000000
--- a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isFinite/8a23ad.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isFinite(vec3<f32>());
-                        ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isFinite_8a23ad() {
-  bool3 res = isfinite(float3());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isFinite_8a23ad();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isFinite_8a23ad();
-  return;
-}
-
-kernel void compute_main() {
-  isFinite_8a23ad();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.spvasm b/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.spvasm
deleted file mode 100644
index cd0fed3..0000000
--- a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-builtins/gen/isFinite/8a23ad.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isFinite(vec3<f32>());
-                        ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isFinite_8a23ad "isFinite_8a23ad"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v3bool = OpTypeVector %bool 3
-    %v3float = OpTypeVector %float 3
-         %17 = OpConstantNull %v3float
-%_ptr_Function_v3bool = OpTypePointer Function %v3bool
-         %23 = OpConstantNull %v3bool
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isFinite_8a23ad = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v3bool Function %23
-         %18 = OpIsInf %v3bool %17
-         %19 = OpIsNan %v3bool %17
-         %20 = OpLogicalOr %v3bool %18 %19
-         %13 = OpLogicalNot %v3bool %20
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %isFinite_8a23ad
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isFinite_8a23ad
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %isFinite_8a23ad
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.wgsl b/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.wgsl
deleted file mode 100644
index 5ac53aa..0000000
--- a/test/tint/builtins/gen/isFinite/8a23ad.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isFinite/8a23ad.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isFinite(vec3<f32>());
-                        ^^^^^^^^
-
-fn isFinite_8a23ad() {
-  var res : vec3<bool> = isFinite(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_8a23ad();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_8a23ad();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_8a23ad();
-}
diff --git a/test/tint/builtins/gen/isFinite/f31987.wgsl b/test/tint/builtins/gen/isFinite/f31987.wgsl
deleted file mode 100644
index 6582552..0000000
--- a/test/tint/builtins/gen/isFinite/f31987.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isFinite(vec<4, f32>) -> vec<4, bool>
-fn isFinite_f31987() {
-  var res: vec4<bool> = isFinite(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_f31987();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_f31987();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_f31987();
-}
diff --git a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.glsl b/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.glsl
deleted file mode 100644
index e001b01..0000000
--- a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.glsl
+++ /dev/null
@@ -1,78 +0,0 @@
-SKIP: FAILED
-
-builtins/gen/isFinite/f31987.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isFinite(vec4<f32>());
-                        ^^^^^^^^
-
-#version 310 es
-
-void isFinite_f31987() {
-  bvec4 res = isfinite(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isFinite_f31987();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp 4-component vector of bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-precision mediump float;
-
-void isFinite_f31987() {
-  bvec4 res = isfinite(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isFinite_f31987();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:5: 'isfinite' : no matching overloaded function found 
-ERROR: 0:5: '=' :  cannot convert from ' const float' to ' temp 4-component vector of bool'
-ERROR: 0:5: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
-#version 310 es
-
-void isFinite_f31987() {
-  bvec4 res = isfinite(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isFinite_f31987();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
-Error parsing GLSL shader:
-ERROR: 0:4: 'isfinite' : no matching overloaded function found 
-ERROR: 0:4: '=' :  cannot convert from ' const float' to ' temp 4-component vector of bool'
-ERROR: 0:4: '' : compilation terminated 
-ERROR: 3 compilation errors.  No code generated.
-
-
-
diff --git a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.hlsl b/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.hlsl
deleted file mode 100644
index ae6ac32..0000000
--- a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isFinite/f31987.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isFinite(vec4<f32>());
-                        ^^^^^^^^
-
-void isFinite_f31987() {
-  bool4 res = isfinite(float4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isFinite_f31987();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isFinite_f31987();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isFinite_f31987();
-  return;
-}
diff --git a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.msl b/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.msl
deleted file mode 100644
index 8a1511a..0000000
--- a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isFinite/f31987.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isFinite(vec4<f32>());
-                        ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isFinite_f31987() {
-  bool4 res = isfinite(float4());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isFinite_f31987();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isFinite_f31987();
-  return;
-}
-
-kernel void compute_main() {
-  isFinite_f31987();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.spvasm b/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.spvasm
deleted file mode 100644
index b6d6711..0000000
--- a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.spvasm
+++ /dev/null
@@ -1,74 +0,0 @@
-builtins/gen/isFinite/f31987.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isFinite(vec4<f32>());
-                        ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isFinite_f31987 "isFinite_f31987"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v4bool = OpTypeVector %bool 4
-%_ptr_Function_v4bool = OpTypePointer Function %v4bool
-         %21 = OpConstantNull %v4bool
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isFinite_f31987 = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v4bool Function %21
-         %16 = OpIsInf %v4bool %5
-         %17 = OpIsNan %v4bool %5
-         %18 = OpLogicalOr %v4bool %16 %17
-         %13 = OpLogicalNot %v4bool %18
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %isFinite_f31987
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %isFinite_f31987
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %isFinite_f31987
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.wgsl b/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.wgsl
deleted file mode 100644
index e13a8c9..0000000
--- a/test/tint/builtins/gen/isFinite/f31987.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isFinite/f31987.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isFinite(vec4<f32>());
-                        ^^^^^^^^
-
-fn isFinite_f31987() {
-  var res : vec4<bool> = isFinite(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isFinite_f31987();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isFinite_f31987();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isFinite_f31987();
-}
diff --git a/test/tint/builtins/gen/isInf/666f2a.wgsl b/test/tint/builtins/gen/isInf/666f2a.wgsl
deleted file mode 100644
index 0ba01ef..0000000
--- a/test/tint/builtins/gen/isInf/666f2a.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isInf(vec<3, f32>) -> vec<3, bool>
-fn isInf_666f2a() {
-  var res: vec3<bool> = isInf(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_666f2a();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_666f2a();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_666f2a();
-}
diff --git a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.glsl b/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.glsl
deleted file mode 100644
index 04e24af..0000000
--- a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isInf/666f2a.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isInf(vec3<f32>());
-                        ^^^^^
-
-#version 310 es
-
-void isInf_666f2a() {
-  bvec3 res = isinf(vec3(0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isInf_666f2a();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isInf_666f2a() {
-  bvec3 res = isinf(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isInf_666f2a();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isInf_666f2a() {
-  bvec3 res = isinf(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isInf_666f2a();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.hlsl b/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.hlsl
deleted file mode 100644
index 8890a79..0000000
--- a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isInf/666f2a.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isInf(vec3<f32>());
-                        ^^^^^
-
-void isInf_666f2a() {
-  bool3 res = isinf(float3(0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isInf_666f2a();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isInf_666f2a();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isInf_666f2a();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.msl b/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.msl
deleted file mode 100644
index e9cc7a0..0000000
--- a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isInf/666f2a.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isInf(vec3<f32>());
-                        ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isInf_666f2a() {
-  bool3 res = isinf(float3());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isInf_666f2a();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isInf_666f2a();
-  return;
-}
-
-kernel void compute_main() {
-  isInf_666f2a();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.spvasm b/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.spvasm
deleted file mode 100644
index 6cea7ae..0000000
--- a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.spvasm
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isInf/666f2a.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isInf(vec3<f32>());
-                        ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 35
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isInf_666f2a "isInf_666f2a"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v3bool = OpTypeVector %bool 3
-    %v3float = OpTypeVector %float 3
-         %17 = OpConstantNull %v3float
-%_ptr_Function_v3bool = OpTypePointer Function %v3bool
-         %20 = OpConstantNull %v3bool
-         %21 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isInf_666f2a = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v3bool Function %20
-         %13 = OpIsInf %v3bool %17
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %21
-         %23 = OpLabel
-         %24 = OpFunctionCall %void %isInf_666f2a
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %26 = OpLabel
-         %27 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %27
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %isInf_666f2a
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isInf_666f2a
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.wgsl b/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.wgsl
deleted file mode 100644
index a3f6c55..0000000
--- a/test/tint/builtins/gen/isInf/666f2a.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isInf/666f2a.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isInf(vec3<f32>());
-                        ^^^^^
-
-fn isInf_666f2a() {
-  var res : vec3<bool> = isInf(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_666f2a();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_666f2a();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_666f2a();
-}
diff --git a/test/tint/builtins/gen/isInf/7bd98f.wgsl b/test/tint/builtins/gen/isInf/7bd98f.wgsl
deleted file mode 100644
index a51c084..0000000
--- a/test/tint/builtins/gen/isInf/7bd98f.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isInf(f32) -> bool
-fn isInf_7bd98f() {
-  var res: bool = isInf(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_7bd98f();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_7bd98f();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_7bd98f();
-}
diff --git a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.glsl b/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.glsl
deleted file mode 100644
index a62e073..0000000
--- a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isInf/7bd98f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isInf(1.0);
-                  ^^^^^
-
-#version 310 es
-
-void isInf_7bd98f() {
-  bool res = isinf(1.0f);
-}
-
-vec4 vertex_main() {
-  isInf_7bd98f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isInf_7bd98f() {
-  bool res = isinf(1.0f);
-}
-
-void fragment_main() {
-  isInf_7bd98f();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isInf_7bd98f() {
-  bool res = isinf(1.0f);
-}
-
-void compute_main() {
-  isInf_7bd98f();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.hlsl b/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.hlsl
deleted file mode 100644
index bfff65b..0000000
--- a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isInf/7bd98f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isInf(1.0);
-                  ^^^^^
-
-void isInf_7bd98f() {
-  bool res = isinf(1.0f);
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isInf_7bd98f();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isInf_7bd98f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isInf_7bd98f();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.msl b/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.msl
deleted file mode 100644
index a79b870..0000000
--- a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isInf/7bd98f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isInf(1.0);
-                  ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isInf_7bd98f() {
-  bool res = isinf(1.0f);
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isInf_7bd98f();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isInf_7bd98f();
-  return;
-}
-
-kernel void compute_main() {
-  isInf_7bd98f();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.spvasm b/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.spvasm
deleted file mode 100644
index b1f68c1..0000000
--- a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,70 +0,0 @@
-builtins/gen/isInf/7bd98f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isInf(1.0);
-                  ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 32
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isInf_7bd98f "isInf_7bd98f"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-    %float_1 = OpConstant %float 1
-%_ptr_Function_bool = OpTypePointer Function %bool
-         %18 = OpConstantNull %bool
-         %19 = OpTypeFunction %v4float
-%isInf_7bd98f = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_bool Function %18
-         %13 = OpIsInf %bool %float_1
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %19
-         %21 = OpLabel
-         %22 = OpFunctionCall %void %isInf_7bd98f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %24 = OpLabel
-         %25 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %25
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %isInf_7bd98f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %isInf_7bd98f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.wgsl b/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.wgsl
deleted file mode 100644
index c153269..0000000
--- a/test/tint/builtins/gen/isInf/7bd98f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isInf/7bd98f.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isInf(1.0);
-                  ^^^^^
-
-fn isInf_7bd98f() {
-  var res : bool = isInf(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_7bd98f();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_7bd98f();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_7bd98f();
-}
diff --git a/test/tint/builtins/gen/isInf/7e81b5.wgsl b/test/tint/builtins/gen/isInf/7e81b5.wgsl
deleted file mode 100644
index 8e9ce1a..0000000
--- a/test/tint/builtins/gen/isInf/7e81b5.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isInf(vec<4, f32>) -> vec<4, bool>
-fn isInf_7e81b5() {
-  var res: vec4<bool> = isInf(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_7e81b5();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_7e81b5();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_7e81b5();
-}
diff --git a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.glsl b/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.glsl
deleted file mode 100644
index 69b56a7..0000000
--- a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isInf/7e81b5.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isInf(vec4<f32>());
-                        ^^^^^
-
-#version 310 es
-
-void isInf_7e81b5() {
-  bvec4 res = isinf(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isInf_7e81b5();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isInf_7e81b5() {
-  bvec4 res = isinf(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isInf_7e81b5();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isInf_7e81b5() {
-  bvec4 res = isinf(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isInf_7e81b5();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.hlsl b/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.hlsl
deleted file mode 100644
index 4078ead..0000000
--- a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isInf/7e81b5.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isInf(vec4<f32>());
-                        ^^^^^
-
-void isInf_7e81b5() {
-  bool4 res = isinf(float4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isInf_7e81b5();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isInf_7e81b5();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isInf_7e81b5();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.msl b/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.msl
deleted file mode 100644
index f553fa9..0000000
--- a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isInf/7e81b5.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isInf(vec4<f32>());
-                        ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isInf_7e81b5() {
-  bool4 res = isinf(float4());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isInf_7e81b5();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isInf_7e81b5();
-  return;
-}
-
-kernel void compute_main() {
-  isInf_7e81b5();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.spvasm b/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.spvasm
deleted file mode 100644
index 304a980..0000000
--- a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.spvasm
+++ /dev/null
@@ -1,71 +0,0 @@
-builtins/gen/isInf/7e81b5.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isInf(vec4<f32>());
-                        ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 33
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isInf_7e81b5 "isInf_7e81b5"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v4bool = OpTypeVector %bool 4
-%_ptr_Function_v4bool = OpTypePointer Function %v4bool
-         %18 = OpConstantNull %v4bool
-         %19 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isInf_7e81b5 = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v4bool Function %18
-         %13 = OpIsInf %v4bool %5
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %19
-         %21 = OpLabel
-         %22 = OpFunctionCall %void %isInf_7e81b5
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %24 = OpLabel
-         %25 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %25
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %isInf_7e81b5
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %isInf_7e81b5
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.wgsl b/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.wgsl
deleted file mode 100644
index 44f63a9..0000000
--- a/test/tint/builtins/gen/isInf/7e81b5.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isInf/7e81b5.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isInf(vec4<f32>());
-                        ^^^^^
-
-fn isInf_7e81b5() {
-  var res : vec4<bool> = isInf(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_7e81b5();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_7e81b5();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_7e81b5();
-}
diff --git a/test/tint/builtins/gen/isInf/a46d6f.wgsl b/test/tint/builtins/gen/isInf/a46d6f.wgsl
deleted file mode 100644
index a878687..0000000
--- a/test/tint/builtins/gen/isInf/a46d6f.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isInf(vec<2, f32>) -> vec<2, bool>
-fn isInf_a46d6f() {
-  var res: vec2<bool> = isInf(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_a46d6f();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_a46d6f();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_a46d6f();
-}
diff --git a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.glsl b/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.glsl
deleted file mode 100644
index 5a9b1bd..0000000
--- a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isInf/a46d6f.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isInf(vec2<f32>());
-                        ^^^^^
-
-#version 310 es
-
-void isInf_a46d6f() {
-  bvec2 res = isinf(vec2(0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isInf_a46d6f();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isInf_a46d6f() {
-  bvec2 res = isinf(vec2(0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isInf_a46d6f();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isInf_a46d6f() {
-  bvec2 res = isinf(vec2(0.0f, 0.0f));
-}
-
-void compute_main() {
-  isInf_a46d6f();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.hlsl b/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.hlsl
deleted file mode 100644
index c1d2bf2..0000000
--- a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isInf/a46d6f.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isInf(vec2<f32>());
-                        ^^^^^
-
-void isInf_a46d6f() {
-  bool2 res = isinf(float2(0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isInf_a46d6f();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isInf_a46d6f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isInf_a46d6f();
-  return;
-}
diff --git a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.msl b/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.msl
deleted file mode 100644
index 0910502..0000000
--- a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isInf/a46d6f.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isInf(vec2<f32>());
-                        ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isInf_a46d6f() {
-  bool2 res = isinf(float2());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isInf_a46d6f();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isInf_a46d6f();
-  return;
-}
-
-kernel void compute_main() {
-  isInf_a46d6f();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.spvasm b/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.spvasm
deleted file mode 100644
index c0a8d72..0000000
--- a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isInf/a46d6f.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isInf(vec2<f32>());
-                        ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 35
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isInf_a46d6f "isInf_a46d6f"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v2bool = OpTypeVector %bool 2
-    %v2float = OpTypeVector %float 2
-         %17 = OpConstantNull %v2float
-%_ptr_Function_v2bool = OpTypePointer Function %v2bool
-         %20 = OpConstantNull %v2bool
-         %21 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isInf_a46d6f = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v2bool Function %20
-         %13 = OpIsInf %v2bool %17
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %21
-         %23 = OpLabel
-         %24 = OpFunctionCall %void %isInf_a46d6f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %26 = OpLabel
-         %27 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %27
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %isInf_a46d6f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isInf_a46d6f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.wgsl b/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.wgsl
deleted file mode 100644
index d9b764d..0000000
--- a/test/tint/builtins/gen/isInf/a46d6f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isInf/a46d6f.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isInf(vec2<f32>());
-                        ^^^^^
-
-fn isInf_a46d6f() {
-  var res : vec2<bool> = isInf(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isInf_a46d6f();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isInf_a46d6f();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isInf_a46d6f();
-}
diff --git a/test/tint/builtins/gen/isNan/1280ab.wgsl b/test/tint/builtins/gen/isNan/1280ab.wgsl
deleted file mode 100644
index 2159b59..0000000
--- a/test/tint/builtins/gen/isNan/1280ab.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNan(vec<3, f32>) -> vec<3, bool>
-fn isNan_1280ab() {
-  var res: vec3<bool> = isNan(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_1280ab();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_1280ab();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_1280ab();
-}
diff --git a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.glsl b/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.glsl
deleted file mode 100644
index 36acf98..0000000
--- a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isNan/1280ab.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNan(vec3<f32>());
-                        ^^^^^
-
-#version 310 es
-
-void isNan_1280ab() {
-  bvec3 res = isnan(vec3(0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isNan_1280ab();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isNan_1280ab() {
-  bvec3 res = isnan(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isNan_1280ab();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isNan_1280ab() {
-  bvec3 res = isnan(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isNan_1280ab();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.hlsl b/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.hlsl
deleted file mode 100644
index 142d86d..0000000
--- a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isNan/1280ab.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNan(vec3<f32>());
-                        ^^^^^
-
-void isNan_1280ab() {
-  bool3 res = isnan(float3(0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNan_1280ab();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNan_1280ab();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNan_1280ab();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.msl b/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.msl
deleted file mode 100644
index 7df4b32..0000000
--- a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNan/1280ab.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNan(vec3<f32>());
-                        ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNan_1280ab() {
-  bool3 res = isnan(float3());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNan_1280ab();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNan_1280ab();
-  return;
-}
-
-kernel void compute_main() {
-  isNan_1280ab();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.spvasm b/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.spvasm
deleted file mode 100644
index e12a050..0000000
--- a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.spvasm
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isNan/1280ab.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNan(vec3<f32>());
-                        ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 35
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNan_1280ab "isNan_1280ab"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v3bool = OpTypeVector %bool 3
-    %v3float = OpTypeVector %float 3
-         %17 = OpConstantNull %v3float
-%_ptr_Function_v3bool = OpTypePointer Function %v3bool
-         %20 = OpConstantNull %v3bool
-         %21 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isNan_1280ab = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v3bool Function %20
-         %13 = OpIsNan %v3bool %17
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %21
-         %23 = OpLabel
-         %24 = OpFunctionCall %void %isNan_1280ab
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %26 = OpLabel
-         %27 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %27
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %isNan_1280ab
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isNan_1280ab
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.wgsl b/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.wgsl
deleted file mode 100644
index 17dd287..0000000
--- a/test/tint/builtins/gen/isNan/1280ab.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNan/1280ab.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNan(vec3<f32>());
-                        ^^^^^
-
-fn isNan_1280ab() {
-  var res : vec3<bool> = isNan(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_1280ab();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_1280ab();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_1280ab();
-}
diff --git a/test/tint/builtins/gen/isNan/4d280d.wgsl b/test/tint/builtins/gen/isNan/4d280d.wgsl
deleted file mode 100644
index 36838c1..0000000
--- a/test/tint/builtins/gen/isNan/4d280d.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNan(vec<4, f32>) -> vec<4, bool>
-fn isNan_4d280d() {
-  var res: vec4<bool> = isNan(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_4d280d();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_4d280d();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_4d280d();
-}
diff --git a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.glsl b/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.glsl
deleted file mode 100644
index eeb1337..0000000
--- a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isNan/4d280d.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNan(vec4<f32>());
-                        ^^^^^
-
-#version 310 es
-
-void isNan_4d280d() {
-  bvec4 res = isnan(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isNan_4d280d();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isNan_4d280d() {
-  bvec4 res = isnan(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isNan_4d280d();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isNan_4d280d() {
-  bvec4 res = isnan(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isNan_4d280d();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.hlsl b/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.hlsl
deleted file mode 100644
index 724ec54..0000000
--- a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isNan/4d280d.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNan(vec4<f32>());
-                        ^^^^^
-
-void isNan_4d280d() {
-  bool4 res = isnan(float4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNan_4d280d();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNan_4d280d();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNan_4d280d();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.msl b/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.msl
deleted file mode 100644
index f66e036..0000000
--- a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNan/4d280d.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNan(vec4<f32>());
-                        ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNan_4d280d() {
-  bool4 res = isnan(float4());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNan_4d280d();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNan_4d280d();
-  return;
-}
-
-kernel void compute_main() {
-  isNan_4d280d();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.spvasm b/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.spvasm
deleted file mode 100644
index 1fe2d27..0000000
--- a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.spvasm
+++ /dev/null
@@ -1,71 +0,0 @@
-builtins/gen/isNan/4d280d.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNan(vec4<f32>());
-                        ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 33
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNan_4d280d "isNan_4d280d"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v4bool = OpTypeVector %bool 4
-%_ptr_Function_v4bool = OpTypePointer Function %v4bool
-         %18 = OpConstantNull %v4bool
-         %19 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isNan_4d280d = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v4bool Function %18
-         %13 = OpIsNan %v4bool %5
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %19
-         %21 = OpLabel
-         %22 = OpFunctionCall %void %isNan_4d280d
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %24 = OpLabel
-         %25 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %25
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %isNan_4d280d
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %isNan_4d280d
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.wgsl b/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.wgsl
deleted file mode 100644
index 61f41d4..0000000
--- a/test/tint/builtins/gen/isNan/4d280d.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNan/4d280d.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNan(vec4<f32>());
-                        ^^^^^
-
-fn isNan_4d280d() {
-  var res : vec4<bool> = isNan(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_4d280d();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_4d280d();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_4d280d();
-}
diff --git a/test/tint/builtins/gen/isNan/67ecd3.wgsl b/test/tint/builtins/gen/isNan/67ecd3.wgsl
deleted file mode 100644
index 5a0a949..0000000
--- a/test/tint/builtins/gen/isNan/67ecd3.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNan(vec<2, f32>) -> vec<2, bool>
-fn isNan_67ecd3() {
-  var res: vec2<bool> = isNan(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_67ecd3();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_67ecd3();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_67ecd3();
-}
diff --git a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.glsl b/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.glsl
deleted file mode 100644
index f02018d..0000000
--- a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isNan/67ecd3.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNan(vec2<f32>());
-                        ^^^^^
-
-#version 310 es
-
-void isNan_67ecd3() {
-  bvec2 res = isnan(vec2(0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isNan_67ecd3();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isNan_67ecd3() {
-  bvec2 res = isnan(vec2(0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isNan_67ecd3();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isNan_67ecd3() {
-  bvec2 res = isnan(vec2(0.0f, 0.0f));
-}
-
-void compute_main() {
-  isNan_67ecd3();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.hlsl b/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.hlsl
deleted file mode 100644
index f18e86a..0000000
--- a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isNan/67ecd3.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNan(vec2<f32>());
-                        ^^^^^
-
-void isNan_67ecd3() {
-  bool2 res = isnan(float2(0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNan_67ecd3();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNan_67ecd3();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNan_67ecd3();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.msl b/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.msl
deleted file mode 100644
index c858131..0000000
--- a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNan/67ecd3.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNan(vec2<f32>());
-                        ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNan_67ecd3() {
-  bool2 res = isnan(float2());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNan_67ecd3();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNan_67ecd3();
-  return;
-}
-
-kernel void compute_main() {
-  isNan_67ecd3();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.spvasm b/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.spvasm
deleted file mode 100644
index fd0ed88..0000000
--- a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.spvasm
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isNan/67ecd3.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNan(vec2<f32>());
-                        ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 35
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNan_67ecd3 "isNan_67ecd3"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v2bool = OpTypeVector %bool 2
-    %v2float = OpTypeVector %float 2
-         %17 = OpConstantNull %v2float
-%_ptr_Function_v2bool = OpTypePointer Function %v2bool
-         %20 = OpConstantNull %v2bool
-         %21 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isNan_67ecd3 = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v2bool Function %20
-         %13 = OpIsNan %v2bool %17
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %21
-         %23 = OpLabel
-         %24 = OpFunctionCall %void %isNan_67ecd3
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %26 = OpLabel
-         %27 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %27
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %isNan_67ecd3
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isNan_67ecd3
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.wgsl b/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.wgsl
deleted file mode 100644
index 59069ab..0000000
--- a/test/tint/builtins/gen/isNan/67ecd3.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNan/67ecd3.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNan(vec2<f32>());
-                        ^^^^^
-
-fn isNan_67ecd3() {
-  var res : vec2<bool> = isNan(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_67ecd3();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_67ecd3();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_67ecd3();
-}
diff --git a/test/tint/builtins/gen/isNan/e4978e.wgsl b/test/tint/builtins/gen/isNan/e4978e.wgsl
deleted file mode 100644
index 19422d1..0000000
--- a/test/tint/builtins/gen/isNan/e4978e.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNan(f32) -> bool
-fn isNan_e4978e() {
-  var res: bool = isNan(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_e4978e();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_e4978e();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_e4978e();
-}
diff --git a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.glsl b/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.glsl
deleted file mode 100644
index 4d1bfb8..0000000
--- a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.glsl
+++ /dev/null
@@ -1,52 +0,0 @@
-builtins/gen/isNan/e4978e.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNan(1.0);
-                  ^^^^^
-
-#version 310 es
-
-void isNan_e4978e() {
-  bool res = isnan(1.0f);
-}
-
-vec4 vertex_main() {
-  isNan_e4978e();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-void isNan_e4978e() {
-  bool res = isnan(1.0f);
-}
-
-void fragment_main() {
-  isNan_e4978e();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-void isNan_e4978e() {
-  bool res = isnan(1.0f);
-}
-
-void compute_main() {
-  isNan_e4978e();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.hlsl b/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.hlsl
deleted file mode 100644
index 6e0a1fd..0000000
--- a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-builtins/gen/isNan/e4978e.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNan(1.0);
-                  ^^^^^
-
-void isNan_e4978e() {
-  bool res = isnan(1.0f);
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNan_e4978e();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNan_e4978e();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNan_e4978e();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.msl b/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.msl
deleted file mode 100644
index c27efc6..0000000
--- a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNan/e4978e.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNan(1.0);
-                  ^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNan_e4978e() {
-  bool res = isnan(1.0f);
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNan_e4978e();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNan_e4978e();
-  return;
-}
-
-kernel void compute_main() {
-  isNan_e4978e();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.spvasm b/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.spvasm
deleted file mode 100644
index 0d70048..0000000
--- a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.spvasm
+++ /dev/null
@@ -1,70 +0,0 @@
-builtins/gen/isNan/e4978e.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNan(1.0);
-                  ^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 32
-; Schema: 0
-               OpCapability Shader
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNan_e4978e "isNan_e4978e"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-    %float_1 = OpConstant %float 1
-%_ptr_Function_bool = OpTypePointer Function %bool
-         %18 = OpConstantNull %bool
-         %19 = OpTypeFunction %v4float
-%isNan_e4978e = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_bool Function %18
-         %13 = OpIsNan %bool %float_1
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %19
-         %21 = OpLabel
-         %22 = OpFunctionCall %void %isNan_e4978e
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %24 = OpLabel
-         %25 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %25
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %isNan_e4978e
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %isNan_e4978e
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.wgsl b/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.wgsl
deleted file mode 100644
index 840f21a..0000000
--- a/test/tint/builtins/gen/isNan/e4978e.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNan/e4978e.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNan(1.0);
-                  ^^^^^
-
-fn isNan_e4978e() {
-  var res : bool = isNan(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNan_e4978e();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNan_e4978e();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNan_e4978e();
-}
diff --git a/test/tint/builtins/gen/isNormal/863dcd.wgsl b/test/tint/builtins/gen/isNormal/863dcd.wgsl
deleted file mode 100644
index 52cc65c..0000000
--- a/test/tint/builtins/gen/isNormal/863dcd.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNormal(vec<4, f32>) -> vec<4, bool>
-fn isNormal_863dcd() {
-  var res: vec4<bool> = isNormal(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_863dcd();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_863dcd();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_863dcd();
-}
diff --git a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.glsl b/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.glsl
deleted file mode 100644
index 29875d0..0000000
--- a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.glsl
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isNormal/863dcd.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNormal(vec4<f32>());
-                        ^^^^^^^^
-
-#version 310 es
-
-bvec4 tint_isNormal(vec4 param_0) {
-  uvec4 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec4 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_863dcd() {
-  bvec4 res = tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isNormal_863dcd();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-bvec4 tint_isNormal(vec4 param_0) {
-  uvec4 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec4 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_863dcd() {
-  bvec4 res = tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isNormal_863dcd();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-bvec4 tint_isNormal(vec4 param_0) {
-  uvec4 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec4 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_863dcd() {
-  bvec4 res = tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isNormal_863dcd();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.hlsl b/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.hlsl
deleted file mode 100644
index 8573bd5..0000000
--- a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.hlsl
+++ /dev/null
@@ -1,40 +0,0 @@
-builtins/gen/isNormal/863dcd.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNormal(vec4<f32>());
-                        ^^^^^^^^
-
-bool4 tint_isNormal(float4 param_0) {
-  uint4 exponent = asuint(param_0) & 0x7f80000;
-  uint4 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
-void isNormal_863dcd() {
-  bool4 res = tint_isNormal(float4(0.0f, 0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNormal_863dcd();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNormal_863dcd();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNormal_863dcd();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.msl b/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.msl
deleted file mode 100644
index 0096320..0000000
--- a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNormal/863dcd.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNormal(vec4<f32>());
-                        ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNormal_863dcd() {
-  bool4 res = isnormal(float4());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNormal_863dcd();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNormal_863dcd();
-  return;
-}
-
-kernel void compute_main() {
-  isNormal_863dcd();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.spvasm b/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.spvasm
deleted file mode 100644
index d776969..0000000
--- a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-builtins/gen/isNormal/863dcd.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNormal(vec4<f32>());
-                        ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 45
-; Schema: 0
-               OpCapability Shader
-         %16 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNormal_863dcd "isNormal_863dcd"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v4bool = OpTypeVector %bool 4
-       %uint = OpTypeInt 32 0
-%uint_133693440 = OpConstant %uint 133693440
-%uint_524288 = OpConstant %uint 524288
-%uint_133169152 = OpConstant %uint 133169152
-     %v4uint = OpTypeVector %uint 4
-%_ptr_Function_v4bool = OpTypePointer Function %v4bool
-         %30 = OpConstantNull %v4bool
-         %31 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isNormal_863dcd = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v4bool Function %30
-         %22 = OpCompositeConstruct %v4uint %uint_133693440 %uint_133693440 %uint_133693440 %uint_133693440
-         %23 = OpCompositeConstruct %v4uint %uint_524288 %uint_524288 %uint_524288 %uint_524288
-         %24 = OpCompositeConstruct %v4uint %uint_133169152 %uint_133169152 %uint_133169152 %uint_133169152
-         %25 = OpBitcast %v4uint %5
-         %26 = OpBitwiseAnd %v4uint %25 %22
-         %27 = OpExtInst %v4uint %16 UClamp %26 %23 %24
-         %13 = OpIEqual %v4bool %26 %27
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %31
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %isNormal_863dcd
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %36 = OpLabel
-         %37 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %37
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %40 = OpLabel
-         %41 = OpFunctionCall %void %isNormal_863dcd
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %43 = OpLabel
-         %44 = OpFunctionCall %void %isNormal_863dcd
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.wgsl b/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.wgsl
deleted file mode 100644
index d5c77bf..0000000
--- a/test/tint/builtins/gen/isNormal/863dcd.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNormal/863dcd.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec4<bool> = isNormal(vec4<f32>());
-                        ^^^^^^^^
-
-fn isNormal_863dcd() {
-  var res : vec4<bool> = isNormal(vec4<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_863dcd();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_863dcd();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_863dcd();
-}
diff --git a/test/tint/builtins/gen/isNormal/b00ab1.wgsl b/test/tint/builtins/gen/isNormal/b00ab1.wgsl
deleted file mode 100644
index 737c045..0000000
--- a/test/tint/builtins/gen/isNormal/b00ab1.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNormal(vec<2, f32>) -> vec<2, bool>
-fn isNormal_b00ab1() {
-  var res: vec2<bool> = isNormal(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_b00ab1();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_b00ab1();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_b00ab1();
-}
diff --git a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.glsl b/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.glsl
deleted file mode 100644
index 2cdfc12..0000000
--- a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.glsl
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isNormal/b00ab1.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNormal(vec2<f32>());
-                        ^^^^^^^^
-
-#version 310 es
-
-bvec2 tint_isNormal(vec2 param_0) {
-  uvec2 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec2 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_b00ab1() {
-  bvec2 res = tint_isNormal(vec2(0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isNormal_b00ab1();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-bvec2 tint_isNormal(vec2 param_0) {
-  uvec2 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec2 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_b00ab1() {
-  bvec2 res = tint_isNormal(vec2(0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isNormal_b00ab1();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-bvec2 tint_isNormal(vec2 param_0) {
-  uvec2 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec2 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_b00ab1() {
-  bvec2 res = tint_isNormal(vec2(0.0f, 0.0f));
-}
-
-void compute_main() {
-  isNormal_b00ab1();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.hlsl b/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.hlsl
deleted file mode 100644
index 5bcbdb2..0000000
--- a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.hlsl
+++ /dev/null
@@ -1,40 +0,0 @@
-builtins/gen/isNormal/b00ab1.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNormal(vec2<f32>());
-                        ^^^^^^^^
-
-bool2 tint_isNormal(float2 param_0) {
-  uint2 exponent = asuint(param_0) & 0x7f80000;
-  uint2 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
-void isNormal_b00ab1() {
-  bool2 res = tint_isNormal(float2(0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNormal_b00ab1();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNormal_b00ab1();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNormal_b00ab1();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.msl b/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.msl
deleted file mode 100644
index 0a98a92..0000000
--- a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNormal/b00ab1.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNormal(vec2<f32>());
-                        ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNormal_b00ab1() {
-  bool2 res = isnormal(float2());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNormal_b00ab1();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNormal_b00ab1();
-  return;
-}
-
-kernel void compute_main() {
-  isNormal_b00ab1();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.spvasm b/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.spvasm
deleted file mode 100644
index 01b0b52..0000000
--- a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.spvasm
+++ /dev/null
@@ -1,85 +0,0 @@
-builtins/gen/isNormal/b00ab1.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNormal(vec2<f32>());
-                        ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 47
-; Schema: 0
-               OpCapability Shader
-         %18 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNormal_b00ab1 "isNormal_b00ab1"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v2bool = OpTypeVector %bool 2
-    %v2float = OpTypeVector %float 2
-         %17 = OpConstantNull %v2float
-       %uint = OpTypeInt 32 0
-%uint_133693440 = OpConstant %uint 133693440
-%uint_524288 = OpConstant %uint 524288
-%uint_133169152 = OpConstant %uint 133169152
-     %v2uint = OpTypeVector %uint 2
-%_ptr_Function_v2bool = OpTypePointer Function %v2bool
-         %32 = OpConstantNull %v2bool
-         %33 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isNormal_b00ab1 = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v2bool Function %32
-         %24 = OpCompositeConstruct %v2uint %uint_133693440 %uint_133693440
-         %25 = OpCompositeConstruct %v2uint %uint_524288 %uint_524288
-         %26 = OpCompositeConstruct %v2uint %uint_133169152 %uint_133169152
-         %27 = OpBitcast %v2uint %17
-         %28 = OpBitwiseAnd %v2uint %27 %24
-         %29 = OpExtInst %v2uint %18 UClamp %28 %25 %26
-         %13 = OpIEqual %v2bool %28 %29
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %33
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %isNormal_b00ab1
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %38 = OpLabel
-         %39 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %39
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %42 = OpLabel
-         %43 = OpFunctionCall %void %isNormal_b00ab1
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %45 = OpLabel
-         %46 = OpFunctionCall %void %isNormal_b00ab1
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.wgsl b/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.wgsl
deleted file mode 100644
index cc9832b..0000000
--- a/test/tint/builtins/gen/isNormal/b00ab1.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNormal/b00ab1.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec2<bool> = isNormal(vec2<f32>());
-                        ^^^^^^^^
-
-fn isNormal_b00ab1() {
-  var res : vec2<bool> = isNormal(vec2<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_b00ab1();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_b00ab1();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_b00ab1();
-}
diff --git a/test/tint/builtins/gen/isNormal/c286b7.wgsl b/test/tint/builtins/gen/isNormal/c286b7.wgsl
deleted file mode 100644
index 98d2d0a..0000000
--- a/test/tint/builtins/gen/isNormal/c286b7.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNormal(vec<3, f32>) -> vec<3, bool>
-fn isNormal_c286b7() {
-  var res: vec3<bool> = isNormal(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_c286b7();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_c286b7();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_c286b7();
-}
diff --git a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.glsl b/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.glsl
deleted file mode 100644
index 061db27..0000000
--- a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.glsl
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isNormal/c286b7.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNormal(vec3<f32>());
-                        ^^^^^^^^
-
-#version 310 es
-
-bvec3 tint_isNormal(vec3 param_0) {
-  uvec3 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec3 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_c286b7() {
-  bvec3 res = tint_isNormal(vec3(0.0f, 0.0f, 0.0f));
-}
-
-vec4 vertex_main() {
-  isNormal_c286b7();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-bvec3 tint_isNormal(vec3 param_0) {
-  uvec3 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec3 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_c286b7() {
-  bvec3 res = tint_isNormal(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void fragment_main() {
-  isNormal_c286b7();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-bvec3 tint_isNormal(vec3 param_0) {
-  uvec3 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec3 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
-}
-
-
-void isNormal_c286b7() {
-  bvec3 res = tint_isNormal(vec3(0.0f, 0.0f, 0.0f));
-}
-
-void compute_main() {
-  isNormal_c286b7();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.hlsl b/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.hlsl
deleted file mode 100644
index a9061f3..0000000
--- a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,40 +0,0 @@
-builtins/gen/isNormal/c286b7.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNormal(vec3<f32>());
-                        ^^^^^^^^
-
-bool3 tint_isNormal(float3 param_0) {
-  uint3 exponent = asuint(param_0) & 0x7f80000;
-  uint3 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
-void isNormal_c286b7() {
-  bool3 res = tint_isNormal(float3(0.0f, 0.0f, 0.0f));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNormal_c286b7();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNormal_c286b7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNormal_c286b7();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.msl b/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.msl
deleted file mode 100644
index 64d4c29..0000000
--- a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNormal/c286b7.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNormal(vec3<f32>());
-                        ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNormal_c286b7() {
-  bool3 res = isnormal(float3());
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNormal_c286b7();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNormal_c286b7();
-  return;
-}
-
-kernel void compute_main() {
-  isNormal_c286b7();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.spvasm b/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.spvasm
deleted file mode 100644
index 2323fa5..0000000
--- a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,85 +0,0 @@
-builtins/gen/isNormal/c286b7.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNormal(vec3<f32>());
-                        ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 47
-; Schema: 0
-               OpCapability Shader
-         %18 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNormal_c286b7 "isNormal_c286b7"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v3bool = OpTypeVector %bool 3
-    %v3float = OpTypeVector %float 3
-         %17 = OpConstantNull %v3float
-       %uint = OpTypeInt 32 0
-%uint_133693440 = OpConstant %uint 133693440
-%uint_524288 = OpConstant %uint 524288
-%uint_133169152 = OpConstant %uint 133169152
-     %v3uint = OpTypeVector %uint 3
-%_ptr_Function_v3bool = OpTypePointer Function %v3bool
-         %32 = OpConstantNull %v3bool
-         %33 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%isNormal_c286b7 = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_v3bool Function %32
-         %24 = OpCompositeConstruct %v3uint %uint_133693440 %uint_133693440 %uint_133693440
-         %25 = OpCompositeConstruct %v3uint %uint_524288 %uint_524288 %uint_524288
-         %26 = OpCompositeConstruct %v3uint %uint_133169152 %uint_133169152 %uint_133169152
-         %27 = OpBitcast %v3uint %17
-         %28 = OpBitwiseAnd %v3uint %27 %24
-         %29 = OpExtInst %v3uint %18 UClamp %28 %25 %26
-         %13 = OpIEqual %v3bool %28 %29
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %33
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %isNormal_c286b7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %38 = OpLabel
-         %39 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %39
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %42 = OpLabel
-         %43 = OpFunctionCall %void %isNormal_c286b7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %45 = OpLabel
-         %46 = OpFunctionCall %void %isNormal_c286b7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.wgsl b/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.wgsl
deleted file mode 100644
index cc68829..0000000
--- a/test/tint/builtins/gen/isNormal/c286b7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNormal/c286b7.wgsl:28:25 warning: use of deprecated builtin
-  var res: vec3<bool> = isNormal(vec3<f32>());
-                        ^^^^^^^^
-
-fn isNormal_c286b7() {
-  var res : vec3<bool> = isNormal(vec3<f32>());
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_c286b7();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_c286b7();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_c286b7();
-}
diff --git a/test/tint/builtins/gen/isNormal/c6e880.wgsl b/test/tint/builtins/gen/isNormal/c6e880.wgsl
deleted file mode 100644
index 2f5957a..0000000
--- a/test/tint/builtins/gen/isNormal/c6e880.wgsl
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2021 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-////////////////////////////////////////////////////////////////////////////////
-// File generated by tools/builtin-gen
-// using the template:
-//   test/tint/builtins/builtins.wgsl.tmpl
-// and the builtin defintion file:
-//   src/tint/builtins.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-
-// fn isNormal(f32) -> bool
-fn isNormal_c6e880() {
-  var res: bool = isNormal(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_c6e880();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_c6e880();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_c6e880();
-}
diff --git a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.glsl b/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.glsl
deleted file mode 100644
index 0543f12..0000000
--- a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.glsl
+++ /dev/null
@@ -1,73 +0,0 @@
-builtins/gen/isNormal/c6e880.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNormal(1.0);
-                  ^^^^^^^^
-
-#version 310 es
-
-bool tint_isNormal(float param_0) {
-  uint exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uint clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return clamped == exponent;
-}
-
-
-void isNormal_c6e880() {
-  bool res = tint_isNormal(1.0f);
-}
-
-vec4 vertex_main() {
-  isNormal_c6e880();
-  return vec4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-void main() {
-  vec4 inner_result = vertex_main();
-  gl_Position = inner_result;
-  gl_Position.y = -(gl_Position.y);
-  gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w);
-  return;
-}
-#version 310 es
-precision mediump float;
-
-bool tint_isNormal(float param_0) {
-  uint exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uint clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return clamped == exponent;
-}
-
-
-void isNormal_c6e880() {
-  bool res = tint_isNormal(1.0f);
-}
-
-void fragment_main() {
-  isNormal_c6e880();
-}
-
-void main() {
-  fragment_main();
-  return;
-}
-#version 310 es
-
-bool tint_isNormal(float param_0) {
-  uint exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uint clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return clamped == exponent;
-}
-
-
-void isNormal_c6e880() {
-  bool res = tint_isNormal(1.0f);
-}
-
-void compute_main() {
-  isNormal_c6e880();
-}
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main() {
-  compute_main();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.hlsl b/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.hlsl
deleted file mode 100644
index c54510c..0000000
--- a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.hlsl
+++ /dev/null
@@ -1,40 +0,0 @@
-builtins/gen/isNormal/c6e880.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNormal(1.0);
-                  ^^^^^^^^
-
-bool tint_isNormal(float param_0) {
-  uint exponent = asuint(param_0) & 0x7f80000;
-  uint clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
-}
-
-void isNormal_c6e880() {
-  bool res = tint_isNormal(1.0f);
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  isNormal_c6e880();
-  return float4(0.0f, 0.0f, 0.0f, 0.0f);
-}
-
-tint_symbol vertex_main() {
-  const float4 inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = (tint_symbol)0;
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-void fragment_main() {
-  isNormal_c6e880();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  isNormal_c6e880();
-  return;
-}
diff --git a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.msl b/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.msl
deleted file mode 100644
index ed1ec2c..0000000
--- a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-builtins/gen/isNormal/c6e880.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNormal(1.0);
-                  ^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-void isNormal_c6e880() {
-  bool res = isnormal(1.0f);
-}
-
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-float4 vertex_main_inner() {
-  isNormal_c6e880();
-  return float4();
-}
-
-vertex tint_symbol vertex_main() {
-  float4 const inner_result = vertex_main_inner();
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main() {
-  isNormal_c6e880();
-  return;
-}
-
-kernel void compute_main() {
-  isNormal_c6e880();
-  return;
-}
-
diff --git a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.spvasm b/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.spvasm
deleted file mode 100644
index 9e1e207..0000000
--- a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-builtins/gen/isNormal/c6e880.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNormal(1.0);
-                  ^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-         %16 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Vertex %vertex_main "vertex_main" %value %vertex_point_size
-               OpEntryPoint Fragment %fragment_main "fragment_main"
-               OpEntryPoint GLCompute %compute_main "compute_main"
-               OpExecutionMode %fragment_main OriginUpperLeft
-               OpExecutionMode %compute_main LocalSize 1 1 1
-               OpName %value "value"
-               OpName %vertex_point_size "vertex_point_size"
-               OpName %isNormal_c6e880 "isNormal_c6e880"
-               OpName %res "res"
-               OpName %vertex_main_inner "vertex_main_inner"
-               OpName %vertex_main "vertex_main"
-               OpName %fragment_main "fragment_main"
-               OpName %compute_main "compute_main"
-               OpDecorate %value BuiltIn Position
-               OpDecorate %vertex_point_size BuiltIn PointSize
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-          %5 = OpConstantNull %v4float
-      %value = OpVariable %_ptr_Output_v4float Output %5
-%_ptr_Output_float = OpTypePointer Output %float
-          %8 = OpConstantNull %float
-%vertex_point_size = OpVariable %_ptr_Output_float Output %8
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-       %bool = OpTypeBool
-    %float_1 = OpConstant %float 1
-       %uint = OpTypeInt 32 0
-%uint_133693440 = OpConstant %uint 133693440
-%uint_524288 = OpConstant %uint 524288
-%uint_133169152 = OpConstant %uint 133169152
-%_ptr_Function_bool = OpTypePointer Function %bool
-         %26 = OpConstantNull %bool
-         %27 = OpTypeFunction %v4float
-%isNormal_c6e880 = OpFunction %void None %9
-         %12 = OpLabel
-        %res = OpVariable %_ptr_Function_bool Function %26
-         %21 = OpBitcast %uint %float_1
-         %22 = OpBitwiseAnd %uint %21 %uint_133693440
-         %23 = OpExtInst %uint %16 UClamp %22 %uint_524288 %uint_133169152
-         %13 = OpIEqual %bool %22 %23
-               OpStore %res %13
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %27
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %isNormal_c6e880
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %9
-         %32 = OpLabel
-         %33 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %33
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %9
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %isNormal_c6e880
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %9
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %isNormal_c6e880
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.wgsl b/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.wgsl
deleted file mode 100644
index 2f156b5..0000000
--- a/test/tint/builtins/gen/isNormal/c6e880.wgsl.expected.wgsl
+++ /dev/null
@@ -1,23 +0,0 @@
-builtins/gen/isNormal/c6e880.wgsl:28:19 warning: use of deprecated builtin
-  var res: bool = isNormal(1.0);
-                  ^^^^^^^^
-
-fn isNormal_c6e880() {
-  var res : bool = isNormal(1.0);
-}
-
-@stage(vertex)
-fn vertex_main() -> @builtin(position) vec4<f32> {
-  isNormal_c6e880();
-  return vec4<f32>();
-}
-
-@stage(fragment)
-fn fragment_main() {
-  isNormal_c6e880();
-}
-
-@stage(compute) @workgroup_size(1)
-fn compute_main() {
-  isNormal_c6e880();
-}
diff --git a/test/tint/builtins/repeated_use.wgsl b/test/tint/builtins/repeated_use.wgsl
index 0ca4cad..511968d 100644
--- a/test/tint/builtins/repeated_use.wgsl
+++ b/test/tint/builtins/repeated_use.wgsl
@@ -1,20 +1,20 @@
-// Check that for backends that generate intrinsic helpers, repeated use of the
-// same intrinsic overload results in single helper being generated.
+// Check that for backends that generate builtin helpers, repeated use of the
+// same builtin overload results in single helper being generated.
 @stage(compute) @workgroup_size(1)
 fn main() {
-    _ = isNormal(vec4<f32>());
-    _ = isNormal(vec4<f32>(1.));
-    _ = isNormal(vec4<f32>(1., 2., 3., 4.));
+    _ = degrees(vec4<f32>());
+    _ = degrees(vec4<f32>(1.));
+    _ = degrees(vec4<f32>(1., 2., 3., 4.));
 
-    _ = isNormal(vec3<f32>());
-    _ = isNormal(vec3<f32>(1.));
-    _ = isNormal(vec3<f32>(1., 2., 3.));
+    _ = degrees(vec3<f32>());
+    _ = degrees(vec3<f32>(1.));
+    _ = degrees(vec3<f32>(1., 2., 3.));
 
-    _ = isNormal(vec2<f32>());
-    _ = isNormal(vec2<f32>(1.));
-    _ = isNormal(vec2<f32>(1., 2.));
+    _ = degrees(vec2<f32>());
+    _ = degrees(vec2<f32>(1.));
+    _ = degrees(vec2<f32>(1., 2.));
 
-    _ = isNormal(1.);
-    _ = isNormal(2.);
-    _ = isNormal(3.);
+    _ = degrees(1.);
+    _ = degrees(2.);
+    _ = degrees(3.);
 }
diff --git a/test/tint/builtins/repeated_use.wgsl.expected.glsl b/test/tint/builtins/repeated_use.wgsl.expected.glsl
index 23952a5..6c50347 100644
--- a/test/tint/builtins/repeated_use.wgsl.expected.glsl
+++ b/test/tint/builtins/repeated_use.wgsl.expected.glsl
@@ -1,91 +1,35 @@
-builtins/repeated_use.wgsl:5:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:6:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:7:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1., 2., 3., 4.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:9:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:10:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1., 2., 3.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:13:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:14:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:15:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1., 2.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:17:9 warning: use of deprecated builtin
-    _ = isNormal(1.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:18:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:19:9 warning: use of deprecated builtin
-    _ = isNormal(3.);
-        ^^^^^^^^
-
 #version 310 es
 
-bvec4 tint_isNormal(vec4 param_0) {
-  uvec4 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec4 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
+vec4 tint_degrees(vec4 param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
-bvec3 tint_isNormal_1(vec3 param_0) {
-  uvec3 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec3 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
+vec3 tint_degrees_1(vec3 param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
-bvec2 tint_isNormal_2(vec2 param_0) {
-  uvec2 exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uvec2 clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return equal(clamped, exponent);
+vec2 tint_degrees_2(vec2 param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
-bool tint_isNormal_3(float param_0) {
-  uint exponent = floatBitsToUint(param_0) & 0x7f80000u;
-  uint clamped = clamp(exponent, 0x0080000u, 0x7f00000u);
-  return clamped == exponent;
+float tint_degrees_3(float param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
 
 void tint_symbol() {
-  tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f));
-  tint_isNormal(vec4(1.0f));
-  tint_isNormal(vec4(1.0f, 2.0f, 3.0f, 4.0f));
-  tint_isNormal_1(vec3(0.0f, 0.0f, 0.0f));
-  tint_isNormal_1(vec3(1.0f));
-  tint_isNormal_1(vec3(1.0f, 2.0f, 3.0f));
-  tint_isNormal_2(vec2(0.0f, 0.0f));
-  tint_isNormal_2(vec2(1.0f));
-  tint_isNormal_2(vec2(1.0f, 2.0f));
-  tint_isNormal_3(1.0f);
-  tint_isNormal_3(2.0f);
-  tint_isNormal_3(3.0f);
+  tint_degrees(vec4(0.0f, 0.0f, 0.0f, 0.0f));
+  tint_degrees(vec4(1.0f));
+  tint_degrees(vec4(1.0f, 2.0f, 3.0f, 4.0f));
+  tint_degrees_1(vec3(0.0f, 0.0f, 0.0f));
+  tint_degrees_1(vec3(1.0f));
+  tint_degrees_1(vec3(1.0f, 2.0f, 3.0f));
+  tint_degrees_2(vec2(0.0f, 0.0f));
+  tint_degrees_2(vec2(1.0f));
+  tint_degrees_2(vec2(1.0f, 2.0f));
+  tint_degrees_3(1.0f);
+  tint_degrees_3(2.0f);
+  tint_degrees_3(3.0f);
 }
 
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
diff --git a/test/tint/builtins/repeated_use.wgsl.expected.hlsl b/test/tint/builtins/repeated_use.wgsl.expected.hlsl
index eb05edf..c1cb022 100644
--- a/test/tint/builtins/repeated_use.wgsl.expected.hlsl
+++ b/test/tint/builtins/repeated_use.wgsl.expected.hlsl
@@ -1,88 +1,32 @@
-builtins/repeated_use.wgsl:5:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:6:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:7:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1., 2., 3., 4.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:9:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:10:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1., 2., 3.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:13:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:14:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:15:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1., 2.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:17:9 warning: use of deprecated builtin
-    _ = isNormal(1.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:18:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:19:9 warning: use of deprecated builtin
-    _ = isNormal(3.);
-        ^^^^^^^^
-
-bool4 tint_isNormal(float4 param_0) {
-  uint4 exponent = asuint(param_0) & 0x7f80000;
-  uint4 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
+float4 tint_degrees(float4 param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
-bool3 tint_isNormal_1(float3 param_0) {
-  uint3 exponent = asuint(param_0) & 0x7f80000;
-  uint3 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
+float3 tint_degrees_1(float3 param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
-bool2 tint_isNormal_2(float2 param_0) {
-  uint2 exponent = asuint(param_0) & 0x7f80000;
-  uint2 clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
+float2 tint_degrees_2(float2 param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
-bool tint_isNormal_3(float param_0) {
-  uint exponent = asuint(param_0) & 0x7f80000;
-  uint clamped = clamp(exponent, 0x0080000, 0x7f00000);
-  return clamped == exponent;
+float tint_degrees_3(float param_0) {
+  return param_0 * 57.295779513082322865;
 }
 
 [numthreads(1, 1, 1)]
 void main() {
-  tint_isNormal(float4(0.0f, 0.0f, 0.0f, 0.0f));
-  tint_isNormal(float4((1.0f).xxxx));
-  tint_isNormal(float4(1.0f, 2.0f, 3.0f, 4.0f));
-  tint_isNormal_1(float3(0.0f, 0.0f, 0.0f));
-  tint_isNormal_1(float3((1.0f).xxx));
-  tint_isNormal_1(float3(1.0f, 2.0f, 3.0f));
-  tint_isNormal_2(float2(0.0f, 0.0f));
-  tint_isNormal_2(float2((1.0f).xx));
-  tint_isNormal_2(float2(1.0f, 2.0f));
-  tint_isNormal_3(1.0f);
-  tint_isNormal_3(2.0f);
-  tint_isNormal_3(3.0f);
+  tint_degrees(float4(0.0f, 0.0f, 0.0f, 0.0f));
+  tint_degrees(float4((1.0f).xxxx));
+  tint_degrees(float4(1.0f, 2.0f, 3.0f, 4.0f));
+  tint_degrees_1(float3(0.0f, 0.0f, 0.0f));
+  tint_degrees_1(float3((1.0f).xxx));
+  tint_degrees_1(float3(1.0f, 2.0f, 3.0f));
+  tint_degrees_2(float2(0.0f, 0.0f));
+  tint_degrees_2(float2((1.0f).xx));
+  tint_degrees_2(float2(1.0f, 2.0f));
+  tint_degrees_3(1.0f);
+  tint_degrees_3(2.0f);
+  tint_degrees_3(3.0f);
   return;
 }
diff --git a/test/tint/builtins/repeated_use.wgsl.expected.msl b/test/tint/builtins/repeated_use.wgsl.expected.msl
index 5b7314a..cdf0372 100644
--- a/test/tint/builtins/repeated_use.wgsl.expected.msl
+++ b/test/tint/builtins/repeated_use.wgsl.expected.msl
@@ -1,67 +1,36 @@
-builtins/repeated_use.wgsl:5:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:6:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:7:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1., 2., 3., 4.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:9:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:10:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1., 2., 3.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:13:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:14:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:15:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1., 2.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:17:9 warning: use of deprecated builtin
-    _ = isNormal(1.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:18:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:19:9 warning: use of deprecated builtin
-    _ = isNormal(3.);
-        ^^^^^^^^
-
 #include <metal_stdlib>
 
 using namespace metal;
+
+float4 tint_degrees(float4 param_0) {
+  return param_0 * 57.295779513082322865;
+}
+
+float3 tint_degrees_1(float3 param_0) {
+  return param_0 * 57.295779513082322865;
+}
+
+float2 tint_degrees_2(float2 param_0) {
+  return param_0 * 57.295779513082322865;
+}
+
+float tint_degrees_3(float param_0) {
+  return param_0 * 57.295779513082322865;
+}
+
 kernel void tint_symbol() {
-  isnormal(float4());
-  isnormal(float4(1.0f));
-  isnormal(float4(1.0f, 2.0f, 3.0f, 4.0f));
-  isnormal(float3());
-  isnormal(float3(1.0f));
-  isnormal(float3(1.0f, 2.0f, 3.0f));
-  isnormal(float2());
-  isnormal(float2(1.0f));
-  isnormal(float2(1.0f, 2.0f));
-  isnormal(1.0f);
-  isnormal(2.0f);
-  isnormal(3.0f);
+  tint_degrees(float4());
+  tint_degrees(float4(1.0f));
+  tint_degrees(float4(1.0f, 2.0f, 3.0f, 4.0f));
+  tint_degrees_1(float3());
+  tint_degrees_1(float3(1.0f));
+  tint_degrees_1(float3(1.0f, 2.0f, 3.0f));
+  tint_degrees_2(float2());
+  tint_degrees_2(float2(1.0f));
+  tint_degrees_2(float2(1.0f, 2.0f));
+  tint_degrees_3(1.0f);
+  tint_degrees_3(2.0f);
+  tint_degrees_3(3.0f);
   return;
 }
 
diff --git a/test/tint/builtins/repeated_use.wgsl.expected.spvasm b/test/tint/builtins/repeated_use.wgsl.expected.spvasm
index 2c50ace..085ef9d 100644
--- a/test/tint/builtins/repeated_use.wgsl.expected.spvasm
+++ b/test/tint/builtins/repeated_use.wgsl.expected.spvasm
@@ -1,168 +1,46 @@
-builtins/repeated_use.wgsl:5:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:6:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:7:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1., 2., 3., 4.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:9:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:10:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1., 2., 3.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:13:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:14:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:15:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1., 2.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:17:9 warning: use of deprecated builtin
-    _ = isNormal(1.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:18:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:19:9 warning: use of deprecated builtin
-    _ = isNormal(3.);
-        ^^^^^^^^
-
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 109
+; Bound: 35
 ; Schema: 0
                OpCapability Shader
-         %11 = OpExtInstImport "GLSL.std.450"
+          %8 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %main "main"
                OpExecutionMode %main LocalSize 1 1 1
                OpName %main "main"
        %void = OpTypeVoid
           %1 = OpTypeFunction %void
-       %bool = OpTypeBool
-     %v4bool = OpTypeVector %bool 4
       %float = OpTypeFloat 32
     %v4float = OpTypeVector %float 4
-         %10 = OpConstantNull %v4float
-       %uint = OpTypeInt 32 0
-%uint_133693440 = OpConstant %uint 133693440
-%uint_524288 = OpConstant %uint 524288
-%uint_133169152 = OpConstant %uint 133169152
-     %v4uint = OpTypeVector %uint 4
+          %9 = OpConstantNull %v4float
     %float_1 = OpConstant %float 1
-         %25 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
+         %12 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
     %float_2 = OpConstant %float 2
     %float_3 = OpConstant %float 3
     %float_4 = OpConstant %float 4
-         %36 = OpConstantComposite %v4float %float_1 %float_2 %float_3 %float_4
-     %v3bool = OpTypeVector %bool 3
+         %17 = OpConstantComposite %v4float %float_1 %float_2 %float_3 %float_4
     %v3float = OpTypeVector %float 3
-         %46 = OpConstantNull %v3float
-     %v3uint = OpTypeVector %uint 3
-         %55 = OpConstantComposite %v3float %float_1 %float_1 %float_1
-         %63 = OpConstantComposite %v3float %float_1 %float_2 %float_3
-     %v2bool = OpTypeVector %bool 2
+         %20 = OpConstantNull %v3float
+         %22 = OpConstantComposite %v3float %float_1 %float_1 %float_1
+         %24 = OpConstantComposite %v3float %float_1 %float_2 %float_3
     %v2float = OpTypeVector %float 2
-         %73 = OpConstantNull %v2float
-     %v2uint = OpTypeVector %uint 2
-         %82 = OpConstantComposite %v2float %float_1 %float_1
-         %90 = OpConstantComposite %v2float %float_1 %float_2
+         %27 = OpConstantNull %v2float
+         %29 = OpConstantComposite %v2float %float_1 %float_1
+         %31 = OpConstantComposite %v2float %float_1 %float_2
        %main = OpFunction %void None %1
           %4 = OpLabel
-         %17 = OpCompositeConstruct %v4uint %uint_133693440 %uint_133693440 %uint_133693440 %uint_133693440
-         %18 = OpCompositeConstruct %v4uint %uint_524288 %uint_524288 %uint_524288 %uint_524288
-         %19 = OpCompositeConstruct %v4uint %uint_133169152 %uint_133169152 %uint_133169152 %uint_133169152
-         %20 = OpBitcast %v4uint %10
-         %21 = OpBitwiseAnd %v4uint %20 %17
-         %22 = OpExtInst %v4uint %11 UClamp %21 %18 %19
-          %5 = OpIEqual %v4bool %21 %22
-         %26 = OpCompositeConstruct %v4uint %uint_133693440 %uint_133693440 %uint_133693440 %uint_133693440
-         %27 = OpCompositeConstruct %v4uint %uint_524288 %uint_524288 %uint_524288 %uint_524288
-         %28 = OpCompositeConstruct %v4uint %uint_133169152 %uint_133169152 %uint_133169152 %uint_133169152
-         %29 = OpBitcast %v4uint %25
-         %30 = OpBitwiseAnd %v4uint %29 %26
-         %31 = OpExtInst %v4uint %11 UClamp %30 %27 %28
-         %23 = OpIEqual %v4bool %30 %31
-         %37 = OpCompositeConstruct %v4uint %uint_133693440 %uint_133693440 %uint_133693440 %uint_133693440
-         %38 = OpCompositeConstruct %v4uint %uint_524288 %uint_524288 %uint_524288 %uint_524288
-         %39 = OpCompositeConstruct %v4uint %uint_133169152 %uint_133169152 %uint_133169152 %uint_133169152
-         %40 = OpBitcast %v4uint %36
-         %41 = OpBitwiseAnd %v4uint %40 %37
-         %42 = OpExtInst %v4uint %11 UClamp %41 %38 %39
-         %32 = OpIEqual %v4bool %41 %42
-         %48 = OpCompositeConstruct %v3uint %uint_133693440 %uint_133693440 %uint_133693440
-         %49 = OpCompositeConstruct %v3uint %uint_524288 %uint_524288 %uint_524288
-         %50 = OpCompositeConstruct %v3uint %uint_133169152 %uint_133169152 %uint_133169152
-         %51 = OpBitcast %v3uint %46
-         %52 = OpBitwiseAnd %v3uint %51 %48
-         %53 = OpExtInst %v3uint %11 UClamp %52 %49 %50
-         %43 = OpIEqual %v3bool %52 %53
-         %56 = OpCompositeConstruct %v3uint %uint_133693440 %uint_133693440 %uint_133693440
-         %57 = OpCompositeConstruct %v3uint %uint_524288 %uint_524288 %uint_524288
-         %58 = OpCompositeConstruct %v3uint %uint_133169152 %uint_133169152 %uint_133169152
-         %59 = OpBitcast %v3uint %55
-         %60 = OpBitwiseAnd %v3uint %59 %56
-         %61 = OpExtInst %v3uint %11 UClamp %60 %57 %58
-         %54 = OpIEqual %v3bool %60 %61
-         %64 = OpCompositeConstruct %v3uint %uint_133693440 %uint_133693440 %uint_133693440
-         %65 = OpCompositeConstruct %v3uint %uint_524288 %uint_524288 %uint_524288
-         %66 = OpCompositeConstruct %v3uint %uint_133169152 %uint_133169152 %uint_133169152
-         %67 = OpBitcast %v3uint %63
-         %68 = OpBitwiseAnd %v3uint %67 %64
-         %69 = OpExtInst %v3uint %11 UClamp %68 %65 %66
-         %62 = OpIEqual %v3bool %68 %69
-         %75 = OpCompositeConstruct %v2uint %uint_133693440 %uint_133693440
-         %76 = OpCompositeConstruct %v2uint %uint_524288 %uint_524288
-         %77 = OpCompositeConstruct %v2uint %uint_133169152 %uint_133169152
-         %78 = OpBitcast %v2uint %73
-         %79 = OpBitwiseAnd %v2uint %78 %75
-         %80 = OpExtInst %v2uint %11 UClamp %79 %76 %77
-         %70 = OpIEqual %v2bool %79 %80
-         %83 = OpCompositeConstruct %v2uint %uint_133693440 %uint_133693440
-         %84 = OpCompositeConstruct %v2uint %uint_524288 %uint_524288
-         %85 = OpCompositeConstruct %v2uint %uint_133169152 %uint_133169152
-         %86 = OpBitcast %v2uint %82
-         %87 = OpBitwiseAnd %v2uint %86 %83
-         %88 = OpExtInst %v2uint %11 UClamp %87 %84 %85
-         %81 = OpIEqual %v2bool %87 %88
-         %91 = OpCompositeConstruct %v2uint %uint_133693440 %uint_133693440
-         %92 = OpCompositeConstruct %v2uint %uint_524288 %uint_524288
-         %93 = OpCompositeConstruct %v2uint %uint_133169152 %uint_133169152
-         %94 = OpBitcast %v2uint %90
-         %95 = OpBitwiseAnd %v2uint %94 %91
-         %96 = OpExtInst %v2uint %11 UClamp %95 %92 %93
-         %89 = OpIEqual %v2bool %95 %96
-         %98 = OpBitcast %uint %float_1
-         %99 = OpBitwiseAnd %uint %98 %uint_133693440
-        %100 = OpExtInst %uint %11 UClamp %99 %uint_524288 %uint_133169152
-         %97 = OpIEqual %bool %99 %100
-        %102 = OpBitcast %uint %float_2
-        %103 = OpBitwiseAnd %uint %102 %uint_133693440
-        %104 = OpExtInst %uint %11 UClamp %103 %uint_524288 %uint_133169152
-        %101 = OpIEqual %bool %103 %104
-        %106 = OpBitcast %uint %float_3
-        %107 = OpBitwiseAnd %uint %106 %uint_133693440
-        %108 = OpExtInst %uint %11 UClamp %107 %uint_524288 %uint_133169152
-        %105 = OpIEqual %bool %107 %108
+          %5 = OpExtInst %v4float %8 Degrees %9
+         %10 = OpExtInst %v4float %8 Degrees %12
+         %13 = OpExtInst %v4float %8 Degrees %17
+         %18 = OpExtInst %v3float %8 Degrees %20
+         %21 = OpExtInst %v3float %8 Degrees %22
+         %23 = OpExtInst %v3float %8 Degrees %24
+         %25 = OpExtInst %v2float %8 Degrees %27
+         %28 = OpExtInst %v2float %8 Degrees %29
+         %30 = OpExtInst %v2float %8 Degrees %31
+         %32 = OpExtInst %float %8 Degrees %float_1
+         %33 = OpExtInst %float %8 Degrees %float_2
+         %34 = OpExtInst %float %8 Degrees %float_3
                OpReturn
                OpFunctionEnd
diff --git a/test/tint/builtins/repeated_use.wgsl.expected.wgsl b/test/tint/builtins/repeated_use.wgsl.expected.wgsl
index f33ea1c..7b270c7 100644
--- a/test/tint/builtins/repeated_use.wgsl.expected.wgsl
+++ b/test/tint/builtins/repeated_use.wgsl.expected.wgsl
@@ -1,63 +1,15 @@
-builtins/repeated_use.wgsl:5:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:6:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:7:9 warning: use of deprecated builtin
-    _ = isNormal(vec4<f32>(1., 2., 3., 4.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:9:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:10:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:11:9 warning: use of deprecated builtin
-    _ = isNormal(vec3<f32>(1., 2., 3.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:13:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>());
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:14:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:15:9 warning: use of deprecated builtin
-    _ = isNormal(vec2<f32>(1., 2.));
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:17:9 warning: use of deprecated builtin
-    _ = isNormal(1.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:18:9 warning: use of deprecated builtin
-    _ = isNormal(2.);
-        ^^^^^^^^
-
-builtins/repeated_use.wgsl:19:9 warning: use of deprecated builtin
-    _ = isNormal(3.);
-        ^^^^^^^^
-
 @stage(compute) @workgroup_size(1)
 fn main() {
-  _ = isNormal(vec4<f32>());
-  _ = isNormal(vec4<f32>(1.0));
-  _ = isNormal(vec4<f32>(1.0, 2.0, 3.0, 4.0));
-  _ = isNormal(vec3<f32>());
-  _ = isNormal(vec3<f32>(1.0));
-  _ = isNormal(vec3<f32>(1.0, 2.0, 3.0));
-  _ = isNormal(vec2<f32>());
-  _ = isNormal(vec2<f32>(1.0));
-  _ = isNormal(vec2<f32>(1.0, 2.0));
-  _ = isNormal(1.0);
-  _ = isNormal(2.0);
-  _ = isNormal(3.0);
+  _ = degrees(vec4<f32>());
+  _ = degrees(vec4<f32>(1.0));
+  _ = degrees(vec4<f32>(1.0, 2.0, 3.0, 4.0));
+  _ = degrees(vec3<f32>());
+  _ = degrees(vec3<f32>(1.0));
+  _ = degrees(vec3<f32>(1.0, 2.0, 3.0));
+  _ = degrees(vec2<f32>());
+  _ = degrees(vec2<f32>(1.0));
+  _ = degrees(vec2<f32>(1.0, 2.0));
+  _ = degrees(1.0);
+  _ = degrees(2.0);
+  _ = degrees(3.0);
 }
diff --git a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsInf_Scalar.spvasm b/test/tint/unittest/reader/spirv/SpvLogicalTest_IsInf_Scalar.spvasm
deleted file mode 100644
index ba1e0cc..0000000
--- a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsInf_Scalar.spvasm
+++ /dev/null
@@ -1,45 +0,0 @@
-; Test: SpvLogicalTest_IsInf_Scalar.spvasm
-; SPIR-V
-; Version: 1.0
-; Generator: Khronos SPIR-V Tools Assembler; 0
-; Bound: 101
-; Schema: 0
-OpCapability Shader
-OpMemoryModel Logical Simple
-OpEntryPoint Fragment %100 "main"
-OpExecutionMode %100 OriginUpperLeft
-%void = OpTypeVoid
-%3 = OpTypeFunction %void
-%bool = OpTypeBool
-%true = OpConstantTrue %bool
-%false = OpConstantFalse %bool
-%uint = OpTypeInt 32 0
-%int = OpTypeInt 32 1
-%float = OpTypeFloat 32
-%uint_10 = OpConstant %uint 10
-%uint_20 = OpConstant %uint 20
-%int_30 = OpConstant %int 30
-%int_40 = OpConstant %int 40
-%float_50 = OpConstant %float 50
-%float_60 = OpConstant %float 60
-%_ptr_Function_uint = OpTypePointer Function %uint
-%_ptr_Function_int = OpTypePointer Function %int
-%_ptr_Function_float = OpTypePointer Function %float
-%v2bool = OpTypeVector %bool 2
-%v2uint = OpTypeVector %uint 2
-%v2int = OpTypeVector %int 2
-%v2float = OpTypeVector %float 2
-%23 = OpConstantComposite %v2bool %true %false
-%24 = OpConstantComposite %v2bool %false %true
-%25 = OpConstantComposite %v2uint %uint_10 %uint_20
-%26 = OpConstantComposite %v2uint %uint_20 %uint_10
-%27 = OpConstantComposite %v2int %int_30 %int_40
-%28 = OpConstantComposite %v2int %int_40 %int_30
-%29 = OpConstantComposite %v2float %float_50 %float_60
-%30 = OpConstantComposite %v2float %float_60 %float_50
-%100 = OpFunction %void None %3
-%31 = OpLabel
-%1 = OpIsInf %bool %float_50
-OpReturn
-OpFunctionEnd
-
diff --git a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsInf_Vector.spvasm b/test/tint/unittest/reader/spirv/SpvLogicalTest_IsInf_Vector.spvasm
deleted file mode 100644
index 0c5217e..0000000
--- a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsInf_Vector.spvasm
+++ /dev/null
@@ -1,45 +0,0 @@
-; Test: SpvLogicalTest_IsInf_Vector.spvasm
-; SPIR-V
-; Version: 1.0
-; Generator: Khronos SPIR-V Tools Assembler; 0
-; Bound: 101
-; Schema: 0
-OpCapability Shader
-OpMemoryModel Logical Simple
-OpEntryPoint Fragment %100 "main"
-OpExecutionMode %100 OriginUpperLeft
-%void = OpTypeVoid
-%3 = OpTypeFunction %void
-%bool = OpTypeBool
-%true = OpConstantTrue %bool
-%false = OpConstantFalse %bool
-%uint = OpTypeInt 32 0
-%int = OpTypeInt 32 1
-%float = OpTypeFloat 32
-%uint_10 = OpConstant %uint 10
-%uint_20 = OpConstant %uint 20
-%int_30 = OpConstant %int 30
-%int_40 = OpConstant %int 40
-%float_50 = OpConstant %float 50
-%float_60 = OpConstant %float 60
-%_ptr_Function_uint = OpTypePointer Function %uint
-%_ptr_Function_int = OpTypePointer Function %int
-%_ptr_Function_float = OpTypePointer Function %float
-%v2bool = OpTypeVector %bool 2
-%v2uint = OpTypeVector %uint 2
-%v2int = OpTypeVector %int 2
-%v2float = OpTypeVector %float 2
-%23 = OpConstantComposite %v2bool %true %false
-%24 = OpConstantComposite %v2bool %false %true
-%25 = OpConstantComposite %v2uint %uint_10 %uint_20
-%26 = OpConstantComposite %v2uint %uint_20 %uint_10
-%27 = OpConstantComposite %v2int %int_30 %int_40
-%28 = OpConstantComposite %v2int %int_40 %int_30
-%29 = OpConstantComposite %v2float %float_50 %float_60
-%30 = OpConstantComposite %v2float %float_60 %float_50
-%100 = OpFunction %void None %3
-%31 = OpLabel
-%1 = OpIsInf %v2bool %29
-OpReturn
-OpFunctionEnd
-
diff --git a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Scalar.spvasm b/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Scalar.spvasm
deleted file mode 100644
index 9e4cc5e..0000000
--- a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Scalar.spvasm
+++ /dev/null
@@ -1,45 +0,0 @@
-; Test: SpvLogicalTest_IsNan_Scalar.spvasm
-; SPIR-V
-; Version: 1.0
-; Generator: Khronos SPIR-V Tools Assembler; 0
-; Bound: 101
-; Schema: 0
-OpCapability Shader
-OpMemoryModel Logical Simple
-OpEntryPoint Fragment %100 "main"
-OpExecutionMode %100 OriginUpperLeft
-%void = OpTypeVoid
-%3 = OpTypeFunction %void
-%bool = OpTypeBool
-%true = OpConstantTrue %bool
-%false = OpConstantFalse %bool
-%uint = OpTypeInt 32 0
-%int = OpTypeInt 32 1
-%float = OpTypeFloat 32
-%uint_10 = OpConstant %uint 10
-%uint_20 = OpConstant %uint 20
-%int_30 = OpConstant %int 30
-%int_40 = OpConstant %int 40
-%float_50 = OpConstant %float 50
-%float_60 = OpConstant %float 60
-%_ptr_Function_uint = OpTypePointer Function %uint
-%_ptr_Function_int = OpTypePointer Function %int
-%_ptr_Function_float = OpTypePointer Function %float
-%v2bool = OpTypeVector %bool 2
-%v2uint = OpTypeVector %uint 2
-%v2int = OpTypeVector %int 2
-%v2float = OpTypeVector %float 2
-%23 = OpConstantComposite %v2bool %true %false
-%24 = OpConstantComposite %v2bool %false %true
-%25 = OpConstantComposite %v2uint %uint_10 %uint_20
-%26 = OpConstantComposite %v2uint %uint_20 %uint_10
-%27 = OpConstantComposite %v2int %int_30 %int_40
-%28 = OpConstantComposite %v2int %int_40 %int_30
-%29 = OpConstantComposite %v2float %float_50 %float_60
-%30 = OpConstantComposite %v2float %float_60 %float_50
-%100 = OpFunction %void None %3
-%31 = OpLabel
-%1 = OpIsNan %bool %float_50
-OpReturn
-OpFunctionEnd
-
diff --git a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Vector.spvasm b/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Vector.spvasm
deleted file mode 100644
index 7b21f37..0000000
--- a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Vector.spvasm
+++ /dev/null
@@ -1,45 +0,0 @@
-; Test: SpvLogicalTest_IsNan_Vector.spvasm
-; SPIR-V
-; Version: 1.0
-; Generator: Khronos SPIR-V Tools Assembler; 0
-; Bound: 101
-; Schema: 0
-OpCapability Shader
-OpMemoryModel Logical Simple
-OpEntryPoint Fragment %100 "main"
-OpExecutionMode %100 OriginUpperLeft
-%void = OpTypeVoid
-%3 = OpTypeFunction %void
-%bool = OpTypeBool
-%true = OpConstantTrue %bool
-%false = OpConstantFalse %bool
-%uint = OpTypeInt 32 0
-%int = OpTypeInt 32 1
-%float = OpTypeFloat 32
-%uint_10 = OpConstant %uint 10
-%uint_20 = OpConstant %uint 20
-%int_30 = OpConstant %int 30
-%int_40 = OpConstant %int 40
-%float_50 = OpConstant %float 50
-%float_60 = OpConstant %float 60
-%_ptr_Function_uint = OpTypePointer Function %uint
-%_ptr_Function_int = OpTypePointer Function %int
-%_ptr_Function_float = OpTypePointer Function %float
-%v2bool = OpTypeVector %bool 2
-%v2uint = OpTypeVector %uint 2
-%v2int = OpTypeVector %int 2
-%v2float = OpTypeVector %float 2
-%23 = OpConstantComposite %v2bool %true %false
-%24 = OpConstantComposite %v2bool %false %true
-%25 = OpConstantComposite %v2uint %uint_10 %uint_20
-%26 = OpConstantComposite %v2uint %uint_20 %uint_10
-%27 = OpConstantComposite %v2int %int_30 %int_40
-%28 = OpConstantComposite %v2int %int_40 %int_30
-%29 = OpConstantComposite %v2float %float_50 %float_60
-%30 = OpConstantComposite %v2float %float_60 %float_50
-%100 = OpFunction %void None %3
-%31 = OpLabel
-%1 = OpIsNan %v2bool %29
-OpReturn
-OpFunctionEnd
-
diff --git a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Vector.spvasm.expected.hlsl b/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Vector.spvasm.expected.hlsl
deleted file mode 100644
index 415f631..0000000
--- a/test/tint/unittest/reader/spirv/SpvLogicalTest_IsNan_Vector.spvasm.expected.hlsl
+++ /dev/null
@@ -1,12 +0,0 @@
-SKIP: FAILED
-
-warning: use of deprecated builtin
-void main_1() {
-  const bool2 x_1 = isnan(float2(50.0f, 60.0f));
-  return;
-}
-
-void main() {
-  main_1();
-  return;
-}
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm
deleted file mode 100644
index 00788a0..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm
+++ /dev/null
@@ -1,147 +0,0 @@
-               OpCapability Shader
-          %1 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %_GLF_color
-               OpExecutionMode %main OriginUpperLeft
-               OpSource ESSL 310
-               OpName %main "main"
-               OpName %f0 "f0"
-               OpName %s1 "s1"
-               OpName %f1 "f1"
-               OpName %_GLF_color "_GLF_color"
-               OpName %buf1 "buf1"
-               OpMemberName %buf1 0 "_GLF_uniform_int_values"
-               OpName %_ ""
-               OpName %buf0 "buf0"
-               OpMemberName %buf0 0 "_GLF_uniform_float_values"
-               OpName %__0 ""
-               OpDecorate %_GLF_color Location 0
-               OpDecorate %_arr_int_uint_2 ArrayStride 16
-               OpMemberDecorate %buf1 0 Offset 0
-               OpDecorate %buf1 Block
-               OpDecorate %_ DescriptorSet 0
-               OpDecorate %_ Binding 1
-               OpDecorate %_arr_float_uint_1 ArrayStride 16
-               OpMemberDecorate %buf0 0 Offset 0
-               OpDecorate %buf0 Block
-               OpDecorate %__0 DescriptorSet 0
-               OpDecorate %__0 Binding 0
-       %void = OpTypeVoid
-         %14 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-%_ptr_Function_float = OpTypePointer Function %float
-   %float_10 = OpConstant %float 10
-%float_9_99999997en07 = OpConstant %float 9.99999997e-07
-%float_0x1_b38fb8pn127 = OpConstant %float 0x1.b38fb8p-127
-    %float_0 = OpConstant %float 0
-       %bool = OpTypeBool
-    %float_1 = OpConstant %float 1
-%float_0_99000001 = OpConstant %float 0.99000001
-%float_0_00999999978 = OpConstant %float 0.00999999978
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
- %_GLF_color = OpVariable %_ptr_Output_v4float Output
-        %int = OpTypeInt 32 1
-       %uint = OpTypeInt 32 0
-     %uint_2 = OpConstant %uint 2
-%_arr_int_uint_2 = OpTypeArray %int %uint_2
-       %buf1 = OpTypeStruct %_arr_int_uint_2
-%_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
-          %_ = OpVariable %_ptr_Uniform_buf1 Uniform
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-%_ptr_Uniform_int = OpTypePointer Uniform %int
-     %uint_1 = OpConstant %uint 1
-%_arr_float_uint_1 = OpTypeArray %float %uint_1
-       %buf0 = OpTypeStruct %_arr_float_uint_1
-%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
-        %__0 = OpVariable %_ptr_Uniform_buf0 Uniform
-       %main = OpFunction %void None %14
-         %36 = OpLabel
-         %f0 = OpVariable %_ptr_Function_float Function
-         %s1 = OpVariable %_ptr_Function_float Function
-         %f1 = OpVariable %_ptr_Function_float Function
-         %37 = OpFMod %float %float_10 %float_9_99999997en07
-               OpStore %f0 %37
-               OpStore %s1 %float_0x1_b38fb8pn127
-         %38 = OpLoad %float %s1
-         %39 = OpFOrdEqual %bool %38 %float_0
-               OpSelectionMerge %40 None
-               OpBranchConditional %39 %41 %40
-         %41 = OpLabel
-               OpStore %s1 %float_1
-               OpBranch %40
-         %40 = OpLabel
-         %42 = OpLoad %float %s1
-         %43 = OpFMod %float %float_10 %42
-               OpStore %f1 %43
-         %44 = OpLoad %float %f1
-         %45 = OpIsInf %bool %44
-         %46 = OpLoad %float %s1
-         %47 = OpFOrdEqual %bool %46 %float_1
-         %48 = OpLogicalOr %bool %45 %47
-         %49 = OpLogicalNot %bool %48
-               OpSelectionMerge %50 None
-               OpBranchConditional %49 %51 %50
-         %51 = OpLabel
-         %52 = OpLoad %float %f0
-         %53 = OpLoad %float %f1
-         %54 = OpFOrdEqual %bool %52 %53
-         %55 = OpLogicalNot %bool %54
-               OpSelectionMerge %56 None
-               OpBranchConditional %55 %57 %56
-         %57 = OpLabel
-         %58 = OpLoad %float %f0
-         %59 = OpFOrdGreaterThan %bool %58 %float_0_99000001
-         %60 = OpLoad %float %f0
-         %61 = OpFOrdLessThan %bool %60 %float_0_00999999978
-         %62 = OpLogicalAnd %bool %59 %61
-               OpBranch %56
-         %56 = OpLabel
-         %63 = OpPhi %bool %54 %51 %62 %57
-         %64 = OpLogicalNot %bool %63
-               OpSelectionMerge %65 None
-               OpBranchConditional %64 %66 %65
-         %66 = OpLabel
-         %67 = OpLoad %float %f1
-         %68 = OpFOrdGreaterThan %bool %67 %float_0_99000001
-         %69 = OpLoad %float %f1
-         %70 = OpFOrdLessThan %bool %69 %float_0_00999999978
-         %71 = OpLogicalAnd %bool %68 %70
-               OpBranch %65
-         %65 = OpLabel
-         %72 = OpPhi %bool %63 %56 %71 %66
-               OpBranch %50
-         %50 = OpLabel
-         %73 = OpPhi %bool %48 %40 %72 %65
-         %74 = OpLoad %float %f1
-         %75 = OpFOrdEqual %bool %74 %float_10
-         %76 = OpLogicalOr %bool %73 %75
-               OpSelectionMerge %77 None
-               OpBranchConditional %76 %78 %79
-         %78 = OpLabel
-         %80 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_1
-         %81 = OpLoad %int %80
-         %82 = OpConvertSToF %float %81
-         %83 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_0
-         %84 = OpLoad %int %83
-         %85 = OpConvertSToF %float %84
-         %86 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_0
-         %87 = OpLoad %int %86
-         %88 = OpConvertSToF %float %87
-         %89 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_1
-         %90 = OpLoad %int %89
-         %91 = OpConvertSToF %float %90
-         %92 = OpCompositeConstruct %v4float %82 %85 %88 %91
-               OpStore %_GLF_color %92
-               OpBranch %77
-         %79 = OpLabel
-         %93 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_0
-         %94 = OpLoad %int %93
-         %95 = OpConvertSToF %float %94
-         %96 = OpCompositeConstruct %v4float %95 %95 %95 %95
-               OpStore %_GLF_color %96
-               OpBranch %77
-         %77 = OpLabel
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl
deleted file mode 100644
index 9a72028..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl
+++ /dev/null
@@ -1,88 +0,0 @@
-type Arr = @stride(16) array<i32, 2>;
-
-struct buf1 {
-  x_GLF_uniform_int_values : Arr;
-};
-
-type Arr_1 = @stride(16) array<f32, 1>;
-
-struct buf0 {
-  x_GLF_uniform_float_values : Arr_1;
-};
-
-var<private> x_GLF_color : vec4<f32>;
-
-@group(0) @binding(1) var<uniform> x_8 : buf1;
-
-@group(0) @binding(0) var<uniform> x_10 : buf0;
-
-fn main_1() {
-  var f0 : f32;
-  var s1 : f32;
-  var f1 : f32;
-  var x_72 : bool;
-  var x_73_phi : bool;
-  f0 = (10.0 % 0.000001);
-  s1 = 0x1.b38fb8p-127;
-  let x_38 : f32 = s1;
-  if ((x_38 == 0.0)) {
-    s1 = 1.0;
-  }
-  var x_62 : bool;
-  var x_71 : bool;
-  var x_63_phi : bool;
-  var x_72_phi : bool;
-  let x_42 : f32 = s1;
-  f1 = (10.0 % x_42);
-  let x_44 : f32 = f1;
-  let x_46 : f32 = s1;
-  let x_48 : bool = (isInf(x_44) || (x_46 == 1.0));
-  x_73_phi = x_48;
-  if (!(x_48)) {
-    let x_52 : f32 = f0;
-    let x_53 : f32 = f1;
-    let x_54 : bool = (x_52 == x_53);
-    x_63_phi = x_54;
-    if (!(x_54)) {
-      let x_58 : f32 = f0;
-      let x_60 : f32 = f0;
-      x_62 = ((x_58 > 0.99000001) && (x_60 < 0.01));
-      x_63_phi = x_62;
-    }
-    let x_63 : bool = x_63_phi;
-    x_72_phi = x_63;
-    if (!(x_63)) {
-      let x_67 : f32 = f1;
-      let x_69 : f32 = f1;
-      x_71 = ((x_67 > 0.99000001) && (x_69 < 0.01));
-      x_72_phi = x_71;
-    }
-    x_72 = x_72_phi;
-    x_73_phi = x_72;
-  }
-  let x_73 : bool = x_73_phi;
-  let x_74 : f32 = f1;
-  if ((x_73 || (x_74 == 10.0))) {
-    let x_81 : i32 = x_8.x_GLF_uniform_int_values[1];
-    let x_84 : i32 = x_8.x_GLF_uniform_int_values[0];
-    let x_87 : i32 = x_8.x_GLF_uniform_int_values[0];
-    let x_90 : i32 = x_8.x_GLF_uniform_int_values[1];
-    x_GLF_color = vec4<f32>(f32(x_81), f32(x_84), f32(x_87), f32(x_90));
-  } else {
-    let x_94 : i32 = x_8.x_GLF_uniform_int_values[0];
-    let x_95 : f32 = f32(x_94);
-    x_GLF_color = vec4<f32>(x_95, x_95, x_95, x_95);
-  }
-  return;
-}
-
-struct main_out {
-  @location(0)
-  x_GLF_color_1 : vec4<f32>;
-};
-
-@stage(fragment)
-fn main() -> main_out {
-  main_1();
-  return main_out(x_GLF_color);
-}
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl
deleted file mode 100644
index 41ecdd6..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl
+++ /dev/null
@@ -1,121 +0,0 @@
-vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr = @stride(16) array<i32, 2>;
-            ^^^^^^
-
-vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary
-type Arr_1 = @stride(16) array<f32, 1>;
-              ^^^^^^
-
-vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl:39:22 warning: use of deprecated builtin
-  let x_48 : bool = (isInf(x_44) || (x_46 == 1.0));
-                     ^^^^^
-
-#version 310 es
-precision mediump float;
-
-float tint_float_modulo(float lhs, float rhs) {
-  return (lhs - rhs * trunc(lhs / rhs));
-}
-
-
-layout(location = 0) out vec4 x_GLF_color_1_1;
-struct tint_padded_array_element {
-  int el;
-};
-
-struct buf1 {
-  tint_padded_array_element x_GLF_uniform_int_values[2];
-};
-
-struct tint_padded_array_element_1 {
-  float el;
-};
-
-struct buf0 {
-  tint_padded_array_element_1 x_GLF_uniform_float_values[1];
-};
-
-vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-layout(binding = 1) uniform buf1_1 {
-  tint_padded_array_element x_GLF_uniform_int_values[2];
-} x_8;
-
-void main_1() {
-  float f0 = 0.0f;
-  float s1 = 0.0f;
-  float f1 = 0.0f;
-  bool x_72 = false;
-  bool x_73_phi = false;
-  f0 = tint_float_modulo(10.0f, 0.000001f);
-  s1 = 9.99999935e-39f;
-  if ((s1 == 0.0f)) {
-    s1 = 1.0f;
-  }
-  bool x_62 = false;
-  bool x_71 = false;
-  bool x_63_phi = false;
-  bool x_72_phi = false;
-  f1 = tint_float_modulo(10.0f, s1);
-  bool tint_tmp = isinf(f1);
-  if (!tint_tmp) {
-    tint_tmp = (s1 == 1.0f);
-  }
-  bool x_48 = (tint_tmp);
-  x_73_phi = x_48;
-  if (!(x_48)) {
-    bool x_54 = (f0 == f1);
-    x_63_phi = x_54;
-    if (!(x_54)) {
-      bool tint_tmp_1 = (f0 > 0.99000001f);
-      if (tint_tmp_1) {
-        tint_tmp_1 = (f0 < 0.01f);
-      }
-      x_62 = (tint_tmp_1);
-      x_63_phi = x_62;
-    }
-    bool x_63 = x_63_phi;
-    x_72_phi = x_63;
-    if (!(x_63)) {
-      bool tint_tmp_2 = (f1 > 0.99000001f);
-      if (tint_tmp_2) {
-        tint_tmp_2 = (f1 < 0.01f);
-      }
-      x_71 = (tint_tmp_2);
-      x_72_phi = x_71;
-    }
-    x_72 = x_72_phi;
-    x_73_phi = x_72;
-  }
-  bool tint_tmp_3 = x_73_phi;
-  if (!tint_tmp_3) {
-    tint_tmp_3 = (f1 == 10.0f);
-  }
-  if ((tint_tmp_3)) {
-    int x_81 = x_8.x_GLF_uniform_int_values[1].el;
-    int x_84 = x_8.x_GLF_uniform_int_values[0].el;
-    int x_87 = x_8.x_GLF_uniform_int_values[0].el;
-    int x_90 = x_8.x_GLF_uniform_int_values[1].el;
-    x_GLF_color = vec4(float(x_81), float(x_84), float(x_87), float(x_90));
-  } else {
-    int x_94 = x_8.x_GLF_uniform_int_values[0].el;
-    float x_95 = float(x_94);
-    x_GLF_color = vec4(x_95, x_95, x_95, x_95);
-  }
-  return;
-}
-
-struct main_out {
-  vec4 x_GLF_color_1;
-};
-
-main_out tint_symbol() {
-  main_1();
-  main_out tint_symbol_1 = main_out(x_GLF_color);
-  return tint_symbol_1;
-}
-
-void main() {
-  main_out inner_result = tint_symbol();
-  x_GLF_color_1_1 = inner_result.x_GLF_color_1;
-  return;
-}
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.spvasm b/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.spvasm
deleted file mode 100644
index 7abb413..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.spvasm
+++ /dev/null
@@ -1,70 +0,0 @@
-               OpCapability Shader
-          %1 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %_GLF_color
-               OpExecutionMode %main OriginUpperLeft
-               OpSource ESSL 310
-               OpName %main "main"
-               OpName %f "f"
-               OpName %buf0 "buf0"
-               OpMemberName %buf0 0 "injectionSwitch"
-               OpName %_ ""
-               OpName %_GLF_color "_GLF_color"
-               OpMemberDecorate %buf0 0 Offset 0
-               OpDecorate %buf0 Block
-               OpDecorate %_ DescriptorSet 0
-               OpDecorate %_ Binding 0
-               OpDecorate %_GLF_color Location 0
-       %void = OpTypeVoid
-          %8 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-%_ptr_Function_float = OpTypePointer Function %float
-%float_724_322021 = OpConstant %float 724.322021
-       %bool = OpTypeBool
-    %v2float = OpTypeVector %float 2
-       %buf0 = OpTypeStruct %v2float
-%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
-          %_ = OpVariable %_ptr_Uniform_buf0 Uniform
-        %int = OpTypeInt 32 1
-      %int_0 = OpConstant %int 0
-       %uint = OpTypeInt 32 0
-     %uint_0 = OpConstant %uint 0
-%_ptr_Uniform_float = OpTypePointer Uniform %float
-     %uint_1 = OpConstant %uint 1
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
- %_GLF_color = OpVariable %_ptr_Output_v4float Output
-    %float_1 = OpConstant %float 1
-    %float_0 = OpConstant %float 0
-         %25 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
-         %26 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
-       %main = OpFunction %void None %8
-         %27 = OpLabel
-          %f = OpVariable %_ptr_Function_float Function
-         %28 = OpExtInst %float %1 Sinh %float_724_322021
-               OpStore %f %28
-         %29 = OpLoad %float %f
-         %30 = OpIsInf %bool %29
-         %31 = OpLogicalNot %bool %30
-               OpSelectionMerge %32 None
-               OpBranchConditional %31 %33 %32
-         %33 = OpLabel
-         %34 = OpAccessChain %_ptr_Uniform_float %_ %int_0 %uint_0
-         %35 = OpLoad %float %34
-         %36 = OpAccessChain %_ptr_Uniform_float %_ %int_0 %uint_1
-         %37 = OpLoad %float %36
-         %38 = OpFOrdLessThan %bool %35 %37
-               OpBranch %32
-         %32 = OpLabel
-         %39 = OpPhi %bool %30 %27 %38 %33
-               OpSelectionMerge %40 None
-               OpBranchConditional %39 %41 %42
-         %41 = OpLabel
-               OpStore %_GLF_color %25
-               OpBranch %40
-         %42 = OpLabel
-               OpStore %_GLF_color %26
-               OpBranch %40
-         %40 = OpLabel
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl
deleted file mode 100644
index 5dd0328..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl
+++ /dev/null
@@ -1,41 +0,0 @@
-struct buf0 {
-  injectionSwitch : vec2<f32>;
-};
-
-@group(0) @binding(0) var<uniform> x_6 : buf0;
-
-var<private> x_GLF_color : vec4<f32>;
-
-fn main_1() {
-  var f : f32;
-  var x_38 : bool;
-  var x_39_phi : bool;
-  f = sinh(724.322021484);
-  let x_29 : f32 = f;
-  let x_30 : bool = isInf(x_29);
-  x_39_phi = x_30;
-  if (!(x_30)) {
-    let x_35 : f32 = x_6.injectionSwitch.x;
-    let x_37 : f32 = x_6.injectionSwitch.y;
-    x_38 = (x_35 < x_37);
-    x_39_phi = x_38;
-  }
-  let x_39 : bool = x_39_phi;
-  if (x_39) {
-    x_GLF_color = vec4<f32>(1.0, 0.0, 0.0, 1.0);
-  } else {
-    x_GLF_color = vec4<f32>(0.0, 0.0, 0.0, 0.0);
-  }
-  return;
-}
-
-struct main_out {
-  @location(0)
-  x_GLF_color_1 : vec4<f32>;
-};
-
-@stage(fragment)
-fn main() -> main_out {
-  main_1();
-  return main_out(x_GLF_color);
-}
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.spvasm b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.spvasm
deleted file mode 100644
index bb91929..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.spvasm
+++ /dev/null
@@ -1,73 +0,0 @@
-               OpCapability Shader
-          %1 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %_GLF_color
-               OpExecutionMode %main OriginUpperLeft
-               OpSource ESSL 310
-               OpName %main "main"
-               OpName %_GLF_color "_GLF_color"
-               OpName %buf0 "buf0"
-               OpMemberName %buf0 0 "_GLF_uniform_int_values"
-               OpName %_ ""
-               OpDecorate %_GLF_color Location 0
-               OpDecorate %_arr_int_uint_2 ArrayStride 16
-               OpMemberDecorate %buf0 0 RelaxedPrecision
-               OpMemberDecorate %buf0 0 Offset 0
-               OpDecorate %buf0 Block
-               OpDecorate %_ DescriptorSet 0
-               OpDecorate %_ Binding 0
-               OpDecorate %7 RelaxedPrecision
-               OpDecorate %8 RelaxedPrecision
-               OpDecorate %9 RelaxedPrecision
-               OpDecorate %10 RelaxedPrecision
-               OpDecorate %11 RelaxedPrecision
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-    %v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
- %_GLF_color = OpVariable %_ptr_Output_v4float Output
-        %int = OpTypeInt 32 1
-       %uint = OpTypeInt 32 0
-     %uint_2 = OpConstant %uint 2
-%_arr_int_uint_2 = OpTypeArray %int %uint_2
-       %buf0 = OpTypeStruct %_arr_int_uint_2
-%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
-          %_ = OpVariable %_ptr_Uniform_buf0 Uniform
-      %int_0 = OpConstant %int 0
-%_ptr_Uniform_int = OpTypePointer Uniform %int
-      %int_1 = OpConstant %int 1
-     %uint_0 = OpConstant %uint 0
-       %bool = OpTypeBool
-       %main = OpFunction %void None %13
-         %26 = OpLabel
-         %27 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_0
-          %7 = OpLoad %int %27
-         %28 = OpConvertSToF %float %7
-         %29 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_1
-          %8 = OpLoad %int %29
-         %30 = OpConvertSToF %float %8
-         %31 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_1
-          %9 = OpLoad %int %31
-         %32 = OpConvertSToF %float %9
-         %33 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_0
-         %10 = OpLoad %int %33
-         %34 = OpConvertSToF %float %10
-         %35 = OpCompositeConstruct %v4float %28 %30 %32 %34
-               OpStore %_GLF_color %35
-         %36 = OpLoad %v4float %_GLF_color
-         %37 = OpFNegate %v4float %36
-         %38 = OpCompositeExtract %float %37 0
-         %39 = OpIsNan %bool %38
-               OpSelectionMerge %40 None
-               OpBranchConditional %39 %41 %40
-         %41 = OpLabel
-         %42 = OpAccessChain %_ptr_Uniform_int %_ %int_0 %int_0
-         %11 = OpLoad %int %42
-         %43 = OpConvertSToF %float %11
-         %44 = OpCompositeConstruct %v4float %43 %43 %43 %43
-               OpStore %_GLF_color %44
-               OpBranch %40
-         %40 = OpLabel
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.wgsl
deleted file mode 100644
index 9f58cd8..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.wgsl
+++ /dev/null
@@ -1,35 +0,0 @@
-type Arr = @stride(16) array<i32, 2>;
-
-struct buf0 {
-  x_GLF_uniform_int_values : Arr;
-};
-
-var<private> x_GLF_color : vec4<f32>;
-
-@group(0) @binding(0) var<uniform> x_5 : buf0;
-
-fn main_1() {
-  let x_7 : i32 = x_5.x_GLF_uniform_int_values[0];
-  let x_8 : i32 = x_5.x_GLF_uniform_int_values[1];
-  let x_9 : i32 = x_5.x_GLF_uniform_int_values[1];
-  let x_10 : i32 = x_5.x_GLF_uniform_int_values[0];
-  x_GLF_color = vec4<f32>(f32(x_7), f32(x_8), f32(x_9), f32(x_10));
-  let x_36 : vec4<f32> = x_GLF_color;
-  if (isNan((-(x_36)).x)) {
-    let x_11 : i32 = x_5.x_GLF_uniform_int_values[0];
-    let x_43 : f32 = f32(x_11);
-    x_GLF_color = vec4<f32>(x_43, x_43, x_43, x_43);
-  }
-  return;
-}
-
-struct main_out {
-  @location(0)
-  x_GLF_color_1 : vec4<f32>;
-};
-
-@stage(fragment)
-fn main() -> main_out {
-  main_1();
-  return main_out(x_GLF_color);
-}
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.spvasm b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.spvasm
deleted file mode 100644
index cd282a9..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.spvasm
+++ /dev/null
@@ -1,96 +0,0 @@
-               OpCapability Shader
-          %1 = OpExtInstImport "GLSL.std.450"
-               OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %gl_FragCoord %_GLF_color
-               OpExecutionMode %main OriginUpperLeft
-               OpSource ESSL 310
-               OpName %main "main"
-               OpName %f "f"
-               OpName %gl_FragCoord "gl_FragCoord"
-               OpName %buf0 "buf0"
-               OpMemberName %buf0 0 "zero"
-               OpName %_ ""
-               OpName %_GLF_color "_GLF_color"
-               OpDecorate %gl_FragCoord BuiltIn FragCoord
-               OpMemberDecorate %buf0 0 Offset 0
-               OpDecorate %buf0 Block
-               OpDecorate %_ DescriptorSet 0
-               OpDecorate %_ Binding 0
-               OpDecorate %_GLF_color Location 0
-       %void = OpTypeVoid
-          %9 = OpTypeFunction %void
-      %float = OpTypeFloat 32
-%_ptr_Function_float = OpTypePointer Function %float
-    %v4float = OpTypeVector %float 4
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-%gl_FragCoord = OpVariable %_ptr_Input_v4float Input
-       %uint = OpTypeInt 32 0
-     %uint_0 = OpConstant %uint 0
-%_ptr_Input_float = OpTypePointer Input %float
-%float_n0x1_8p_128 = OpConstant %float -0x1.8p+128
-    %float_5 = OpConstant %float 5
-    %float_0 = OpConstant %float 0
-       %bool = OpTypeBool
-    %float_1 = OpConstant %float 1
-       %buf0 = OpTypeStruct %float
-%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
-          %_ = OpVariable %_ptr_Uniform_buf0 Uniform
-        %int = OpTypeInt 32 1
-      %int_0 = OpConstant %int 0
-%_ptr_Uniform_float = OpTypePointer Uniform %float
-%_ptr_Output_v4float = OpTypePointer Output %v4float
- %_GLF_color = OpVariable %_ptr_Output_v4float Output
-         %27 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
-         %28 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
-       %main = OpFunction %void None %9
-         %29 = OpLabel
-          %f = OpVariable %_ptr_Function_float Function
-         %30 = OpAccessChain %_ptr_Input_float %gl_FragCoord %uint_0
-         %31 = OpLoad %float %30
-               OpStore %f %31
-         %32 = OpLoad %float %f
-         %33 = OpFAdd %float %32 %float_n0x1_8p_128
-               OpStore %f %33
-         %34 = OpLoad %float %f
-         %35 = OpFDiv %float %float_5 %34
-         %36 = OpFOrdEqual %bool %35 %float_0
-               OpSelectionMerge %37 None
-               OpBranchConditional %36 %38 %37
-         %38 = OpLabel
-         %39 = OpLoad %float %f
-         %40 = OpFAdd %float %39 %float_1
-               OpStore %f %40
-               OpBranch %37
-         %37 = OpLabel
-         %41 = OpLoad %float %f
-         %42 = OpIsNan %bool %41
-         %43 = OpLogicalNot %bool %42
-               OpSelectionMerge %44 None
-               OpBranchConditional %43 %45 %44
-         %45 = OpLabel
-         %46 = OpLoad %float %f
-         %47 = OpAccessChain %_ptr_Uniform_float %_ %int_0
-         %48 = OpLoad %float %47
-         %49 = OpFOrdNotEqual %bool %46 %48
-               OpBranch %44
-         %44 = OpLabel
-         %50 = OpPhi %bool %42 %37 %49 %45
-               OpSelectionMerge %51 None
-               OpBranchConditional %50 %52 %51
-         %52 = OpLabel
-               OpStore %f %float_0
-               OpBranch %51
-         %51 = OpLabel
-         %53 = OpLoad %float %f
-         %54 = OpFOrdEqual %bool %53 %float_0
-               OpSelectionMerge %55 None
-               OpBranchConditional %54 %56 %57
-         %56 = OpLabel
-               OpStore %_GLF_color %27
-               OpBranch %55
-         %57 = OpLabel
-               OpStore %_GLF_color %28
-               OpBranch %55
-         %55 = OpLabel
-               OpReturn
-               OpFunctionEnd
diff --git a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.wgsl b/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.wgsl
deleted file mode 100644
index 648957e..0000000
--- a/test/tint/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.wgsl
+++ /dev/null
@@ -1,56 +0,0 @@
-struct buf0 {
-  zero : f32;
-};
-
-var<private> gl_FragCoord : vec4<f32>;
-
-@group(0) @binding(0) var<uniform> x_7 : buf0;
-
-var<private> x_GLF_color : vec4<f32>;
-
-fn main_1() {
-  var f : f32;
-  var x_49 : bool;
-  var x_50_phi : bool;
-  let x_31 : f32 = gl_FragCoord.x;
-  f = x_31;
-  let x_32 : f32 = f;
-  f = (x_32 + -0x1.8p+128);
-  let x_34 : f32 = f;
-  if (((5.0 / x_34) == 0.0)) {
-    let x_39 : f32 = f;
-    f = (x_39 + 1.0);
-  }
-  let x_41 : f32 = f;
-  let x_42 : bool = isNan(x_41);
-  x_50_phi = x_42;
-  if (!(x_42)) {
-    let x_46 : f32 = f;
-    let x_48 : f32 = x_7.zero;
-    x_49 = (x_46 != x_48);
-    x_50_phi = x_49;
-  }
-  let x_50 : bool = x_50_phi;
-  if (x_50) {
-    f = 0.0;
-  }
-  let x_53 : f32 = f;
-  if ((x_53 == 0.0)) {
-    x_GLF_color = vec4<f32>(1.0, 0.0, 0.0, 1.0);
-  } else {
-    x_GLF_color = vec4<f32>(0.0, 0.0, 0.0, 0.0);
-  }
-  return;
-}
-
-struct main_out {
-  @location(0)
-  x_GLF_color_1 : vec4<f32>;
-};
-
-@stage(fragment)
-fn main(@builtin(position) gl_FragCoord_param : vec4<f32>) -> main_out {
-  gl_FragCoord = gl_FragCoord_param;
-  main_1();
-  return main_out(x_GLF_color);
-}