diff --git a/docs/origin-trial-changes.md b/docs/origin-trial-changes.md
index 40bff08517..bb9649771b 100644
--- a/docs/origin-trial-changes.md
+++ b/docs/origin-trial-changes.md
@@ -5,6 +5,8 @@
 ### Breaking Changes
 
 * Deprecated `modf()` and `frexp()` builtin overloads that take a pointer second parameter have been removed.
+* Deprecated texture builtin functions that accepted a `read` access controlled storage texture have been removed.
+* Storage textures must now only use the `write` access control.
 
 ## Changes for M95
 
diff --git a/samples/main.cc b/samples/main.cc
index fdc524d94a..fee450f876 100644
--- a/samples/main.cc
+++ b/samples/main.cc
@@ -346,9 +346,6 @@ std::string ResourceTypeToString(
       return "SampledTexture";
     case tint::inspector::ResourceBinding::ResourceType::kMultisampledTexture:
       return "MultisampledTexture";
-    case tint::inspector::ResourceBinding::ResourceType::
-        kReadOnlyStorageTexture:
-      return "ReadOnlyStorageTexture";
     case tint::inspector::ResourceBinding::ResourceType::
         kWriteOnlyStorageTexture:
       return "WriteOnlyStorageTexture";
@@ -719,8 +716,6 @@ bool GenerateMsl(const tint::Program* program, const Options& options) {
         case tint::inspector::ResourceBinding::ResourceType::kSampledTexture:
         case tint::inspector::ResourceBinding::ResourceType::
             kMultisampledTexture:
-        case tint::inspector::ResourceBinding::ResourceType::
-            kReadOnlyStorageTexture:
         case tint::inspector::ResourceBinding::ResourceType::
             kWriteOnlyStorageTexture:
         case tint::inspector::ResourceBinding::ResourceType::kDepthTexture:
diff --git a/src/ast/intrinsic_texture_helper_test.cc b/src/ast/intrinsic_texture_helper_test.cc
index 1d298a5af1..471a802d41 100644
--- a/src/ast/intrinsic_texture_helper_test.cc
+++ b/src/ast/intrinsic_texture_helper_test.cc
@@ -418,49 +418,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
           "textureDimensions",
           [](ProgramBuilder* b) { return b->ExprList("texture"); },
       },
-      {
-          ValidTextureOverload::kDimensionsStorageRO1d,
-          "textureDimensions(t : texture_storage_1d<rgba32float>) -> i32",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k1d,
-          TextureDataType::kF32,
-          "textureDimensions",
-          [](ProgramBuilder* b) { return b->ExprList("texture"); },
-      },
-      {
-          ValidTextureOverload::kDimensionsStorageRO2d,
-          "textureDimensions(t : texture_storage_2d<rgba32float>) -> "
-          "vec2<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k2d,
-          TextureDataType::kF32,
-          "textureDimensions",
-          [](ProgramBuilder* b) { return b->ExprList("texture"); },
-      },
-      {
-          ValidTextureOverload::kDimensionsStorageRO2dArray,
-          "textureDimensions(t : texture_storage_2d_array<rgba32float>) -> "
-          "vec2<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k2dArray,
-          TextureDataType::kF32,
-          "textureDimensions",
-          [](ProgramBuilder* b) { return b->ExprList("texture"); },
-      },
-      {
-          ValidTextureOverload::kDimensionsStorageRO3d,
-          "textureDimensions(t : texture_storage_3d<rgba32float>) -> "
-          "vec3<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k3d,
-          TextureDataType::kF32,
-          "textureDimensions",
-          [](ProgramBuilder* b) { return b->ExprList("texture"); },
-      },
       {
           ValidTextureOverload::kDimensionsStorageWO1d,
           "textureDimensions(t : texture_storage_1d<rgba32float>) -> i32",
@@ -1899,275 +1856,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
                                4);                  // level
           },
       },
-      {
-          ValidTextureOverload::kLoadStorageRO1dRgba32float,
-          "textureLoad(t      : texture_storage_1d<rgba32float>,\n"
-          "            coords : i32) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k1d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",  // t
-                               1);         // coords
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba8unorm,
-          "textureLoad(t           : texture_storage_2d<rgba8unorm>,\n"
-          "            coords      : vec2<i32>) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba8Unorm,
-          ast::TextureDimension::k2d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba8snorm,
-          "textureLoad(t           : texture_storage_2d<rgba8snorm>,\n"
-          "            coords      : vec2<i32>) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba8Snorm,
-          ast::TextureDimension::k2d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba8uint,
-          "textureLoad(t           : texture_storage_2d<rgba8uint>,\n"
-          "            coords      : vec2<i32>) -> vec4<u32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba8Uint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kU32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba8sint,
-          "textureLoad(t           : texture_storage_2d<rgba8sint>,\n"
-          "            coords      : vec2<i32>) -> vec4<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba8Sint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kI32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba16uint,
-          "textureLoad(t           : texture_storage_2d<rgba16uint>,\n"
-          "            coords      : vec2<i32>) -> vec4<u32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba16Uint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kU32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba16sint,
-          "textureLoad(t           : texture_storage_2d<rgba16sint>,\n"
-          "            coords      : vec2<i32>) -> vec4<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba16Sint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kI32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba16float,
-          "textureLoad(t           : texture_storage_2d<rgba16float>,\n"
-          "            coords      : vec2<i32>) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba16Float,
-          ast::TextureDimension::k2d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dR32uint,
-          "textureLoad(t           : texture_storage_2d<r32uint>,\n"
-          "            coords      : vec2<i32>) -> vec4<u32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kR32Uint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kU32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dR32sint,
-          "textureLoad(t           : texture_storage_2d<r32sint>,\n"
-          "            coords      : vec2<i32>) -> vec4<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kR32Sint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kI32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dR32float,
-          "textureLoad(t           : texture_storage_2d<r32float>,\n"
-          "            coords      : vec2<i32>) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kR32Float,
-          ast::TextureDimension::k2d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRg32uint,
-          "textureLoad(t           : texture_storage_2d<rg32uint>,\n"
-          "            coords      : vec2<i32>) -> vec4<u32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRg32Uint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kU32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRg32sint,
-          "textureLoad(t           : texture_storage_2d<rg32sint>,\n"
-          "            coords      : vec2<i32>) -> vec4<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRg32Sint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kI32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRg32float,
-          "textureLoad(t           : texture_storage_2d<rg32float>,\n"
-          "            coords      : vec2<i32>) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRg32Float,
-          ast::TextureDimension::k2d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba32uint,
-          "textureLoad(t           : texture_storage_2d<rgba32uint>,\n"
-          "            coords      : vec2<i32>) -> vec4<u32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Uint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kU32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba32sint,
-          "textureLoad(t           : texture_storage_2d<rgba32sint>,\n"
-          "            coords      : vec2<i32>) -> vec4<i32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Sint,
-          ast::TextureDimension::k2d,
-          TextureDataType::kI32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dRgba32float,
-          "textureLoad(t           : texture_storage_2d<rgba32float>,\n"
-          "            coords      : vec2<i32>) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k2d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",            // t
-                               b->vec2<i32>(1, 2));  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO2dArrayRgba32float,
-          "textureLoad(t           : "
-          "texture_storage_2d_array<rgba32float>,\n"
-          "            coords      : vec2<i32>,\n"
-          "            array_index : i32) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k2dArray,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",           // t
-                               b->vec2<i32>(1, 2),  // coords
-                               3);                  // array_index
-          },
-      },
-      {
-          ValidTextureOverload::kLoadStorageRO3dRgba32float,
-          "textureLoad(t      : texture_storage_3d<rgba32float>,\n"
-          "            coords : vec3<i32>) -> vec4<f32>",
-          ast::Access::kRead,
-          ast::ImageFormat::kRgba32Float,
-          ast::TextureDimension::k3d,
-          TextureDataType::kF32,
-          "textureLoad",
-          [](ProgramBuilder* b) {
-            return b->ExprList("texture",               // t
-                               b->vec3<i32>(1, 2, 3));  // coords
-          },
-      },
       {
           ValidTextureOverload::kStoreWO1dRgba32float,
           "textureStore(t      : texture_storage_1d<rgba32float>,\n"
diff --git a/src/ast/intrinsic_texture_helper_test.h b/src/ast/intrinsic_texture_helper_test.h
index 446090890a..0c47fa42c0 100644
--- a/src/ast/intrinsic_texture_helper_test.h
+++ b/src/ast/intrinsic_texture_helper_test.h
@@ -61,10 +61,6 @@ enum class ValidTextureOverload {
   kDimensionsDepthCubeArray,
   kDimensionsDepthCubeArrayLevel,
   kDimensionsDepthMultisampled2d,
-  kDimensionsStorageRO1d,
-  kDimensionsStorageRO2d,
-  kDimensionsStorageRO2dArray,
-  kDimensionsStorageRO3d,
   kDimensionsStorageWO1d,
   kDimensionsStorageWO2d,
   kDimensionsStorageWO2dArray,
@@ -160,29 +156,10 @@ enum class ValidTextureOverload {
   kLoadDepth2dLevelF32,
   kLoadDepth2dArrayLevelF32,
   kLoadDepthMultisampled2dF32,
-  kLoadStorageRO1dRgba32float,  // Not permutated for all texel formats
-  kLoadStorageRO2dRgba8unorm,
-  kLoadStorageRO2dRgba8snorm,
-  kLoadStorageRO2dRgba8uint,
-  kLoadStorageRO2dRgba8sint,
-  kLoadStorageRO2dRgba16uint,
-  kLoadStorageRO2dRgba16sint,
-  kLoadStorageRO2dRgba16float,
-  kLoadStorageRO2dR32uint,
-  kLoadStorageRO2dR32sint,
-  kLoadStorageRO2dR32float,
-  kLoadStorageRO2dRg32uint,
-  kLoadStorageRO2dRg32sint,
-  kLoadStorageRO2dRg32float,
-  kLoadStorageRO2dRgba32uint,
-  kLoadStorageRO2dRgba32sint,
-  kLoadStorageRO2dRgba32float,
-  kLoadStorageRO2dArrayRgba32float,  // Not permutated for all texel formats
-  kLoadStorageRO3dRgba32float,       // Not permutated for all texel formats
-  kStoreWO1dRgba32float,             // Not permutated for all texel formats
-  kStoreWO2dRgba32float,             // Not permutated for all texel formats
-  kStoreWO2dArrayRgba32float,        // Not permutated for all texel formats
-  kStoreWO3dRgba32float,             // Not permutated for all texel formats
+  kStoreWO1dRgba32float,       // Not permutated for all texel formats
+  kStoreWO2dRgba32float,       // Not permutated for all texel formats
+  kStoreWO2dArrayRgba32float,  // Not permutated for all texel formats
+  kStoreWO3dRgba32float,       // Not permutated for all texel formats
 };
 
 /// @param texture_overload the ValidTextureOverload
diff --git a/src/ast/module_clone_test.cc b/src/ast/module_clone_test.cc
index 8d3c1a1233..934996c6ed 100644
--- a/src/ast/module_clone_test.cc
+++ b/src/ast/module_clone_test.cc
@@ -48,10 +48,10 @@ type t1 = array<vec4<f32>>;
 var<private> g0 : u32 = 20u;
 var<private> g1 : f32 = 123.0;
 [[group(0), binding(0)]] var g2 : texture_2d<f32>;
-[[group(1), binding(0)]] var g3 : texture_storage_2d<r32uint, read>;
+[[group(1), binding(0)]] var g3 : texture_depth_2d;
 [[group(2), binding(0)]] var g4 : texture_storage_2d<rg32float, write>;
-[[group(3), binding(0)]] var g5 : texture_storage_2d<r32uint, read>;
-[[group(4), binding(0)]] var g6 : texture_storage_2d<rg32float, write>;
+[[group(3), binding(0)]] var g5 : texture_depth_cube_array;
+[[group(4), binding(0)]] var g6 : texture_external;
 
 var<private> g7 : vec3<f32>;
 [[group(0), binding(1)]] var<storage, write> g8 : S0;
diff --git a/src/inspector/inspector.cc b/src/inspector/inspector.cc
index eddcaa02b8..d244c116c3 100644
--- a/src/inspector/inspector.cc
+++ b/src/inspector/inspector.cc
@@ -364,7 +364,6 @@ std::vector<ResourceBinding> Inspector::GetResourceBindings(
            &Inspector::GetComparisonSamplerResourceBindings,
            &Inspector::GetSampledTextureResourceBindings,
            &Inspector::GetMultisampledTextureResourceBindings,
-           &Inspector::GetReadOnlyStorageTextureResourceBindings,
            &Inspector::GetWriteOnlyStorageTextureResourceBindings,
            &Inspector::GetDepthTextureResourceBindings,
            &Inspector::GetDepthMultisampledTextureResourceBindings,
@@ -481,16 +480,10 @@ std::vector<ResourceBinding> Inspector::GetMultisampledTextureResourceBindings(
   return GetSampledTextureResourceBindingsImpl(entry_point, true);
 }
 
-std::vector<ResourceBinding>
-Inspector::GetReadOnlyStorageTextureResourceBindings(
-    const std::string& entry_point) {
-  return GetStorageTextureResourceBindingsImpl(entry_point, true);
-}
-
 std::vector<ResourceBinding>
 Inspector::GetWriteOnlyStorageTextureResourceBindings(
     const std::string& entry_point) {
-  return GetStorageTextureResourceBindingsImpl(entry_point, false);
+  return GetStorageTextureResourceBindingsImpl(entry_point);
 }
 
 std::vector<ResourceBinding> Inspector::GetTextureResourceBindings(
@@ -751,8 +744,7 @@ std::vector<ResourceBinding> Inspector::GetSampledTextureResourceBindingsImpl(
 }
 
 std::vector<ResourceBinding> Inspector::GetStorageTextureResourceBindingsImpl(
-    const std::string& entry_point,
-    bool read_only) {
+    const std::string& entry_point) {
   auto* func = FindEntryPointByName(entry_point);
   if (!func) {
     return {};
@@ -766,14 +758,9 @@ std::vector<ResourceBinding> Inspector::GetStorageTextureResourceBindingsImpl(
 
     auto* texture_type = var->Type()->UnwrapRef()->As<sem::StorageTexture>();
 
-    if (read_only != (texture_type->access() == ast::Access::kRead)) {
-      continue;
-    }
-
     ResourceBinding entry;
     entry.resource_type =
-        read_only ? ResourceBinding::ResourceType::kReadOnlyStorageTexture
-                  : ResourceBinding::ResourceType::kWriteOnlyStorageTexture;
+        ResourceBinding::ResourceType::kWriteOnlyStorageTexture;
     entry.bind_group = binding_info.group->value();
     entry.binding = binding_info.binding->value();
 
diff --git a/src/inspector/inspector.h b/src/inspector/inspector.h
index 2005640bb3..4a9938d3ca 100644
--- a/src/inspector/inspector.h
+++ b/src/inspector/inspector.h
@@ -106,11 +106,6 @@ class Inspector {
   std::vector<ResourceBinding> GetMultisampledTextureResourceBindings(
       const std::string& entry_point);
 
-  /// @param entry_point name of the entry point to get information about.
-  /// @returns vector of all of the bindings for read-only storage textures.
-  std::vector<ResourceBinding> GetReadOnlyStorageTextureResourceBindings(
-      const std::string& entry_point);
-
   /// @param entry_point name of the entry point to get information about.
   /// @returns vector of all of the bindings for write-only storage textures.
   std::vector<ResourceBinding> GetWriteOnlyStorageTextureResourceBindings(
@@ -202,14 +197,11 @@ class Inspector {
       bool multisampled_only);
 
   /// @param entry_point name of the entry point to get information about.
-  /// @param read_only if true get only read-only bindings, otherwise get
-  ///                  write-only bindings.
   /// @returns vector of all of the bindings for the requested storage textures.
   std::vector<ResourceBinding> GetStorageTextureResourceBindingsImpl(
-      const std::string& entry_point,
-      bool read_only);
+      const std::string& entry_point);
 
-  /// Constructes |sampler_targets_| if it hasn't already been instantiated.
+  /// Constructs |sampler_targets_| if it hasn't already been instantiated.
   void GenerateSamplerTargets();
 
   /// For a N-uple of expressions, resolve to the appropriate global resources
diff --git a/src/inspector/inspector_test.cc b/src/inspector/inspector_test.cc
index e02cf92c70..1efef819e5 100644
--- a/src/inspector/inspector_test.cc
+++ b/src/inspector/inspector_test.cc
@@ -134,7 +134,7 @@ typedef std::tuple<ast::ImageFormat,
                    ResourceBinding::ImageFormat,
                    ResourceBinding::SampledKind>
     ImageFormatParams;
-typedef std::tuple<bool, DimensionParams, ImageFormatParams>
+typedef std::tuple<DimensionParams, ImageFormatParams>
     GetStorageTextureTestParams;
 class InspectorGetStorageTextureResourceBindingsTestWithParam
     : public InspectorBuilder,
@@ -1267,18 +1267,13 @@ TEST_F(InspectorGetResourceBindingsTest, Simple) {
   Func("depth_ms_func", {}, ty.void_(), {Ignore("depth_ms_texture")});
 
   auto* st_type = MakeStorageTextureTypes(ast::TextureDimension::k2d,
-                                          ast::ImageFormat::kR32Uint, false);
+                                          ast::ImageFormat::kR32Uint);
   AddStorageTexture("st_var", st_type, 4, 0);
   MakeStorageTextureBodyFunction("st_func", "st_var", ty.vec2<i32>(), {});
 
-  auto* rost_type = MakeStorageTextureTypes(ast::TextureDimension::k2d,
-                                            ast::ImageFormat::kR32Uint, true);
-  AddStorageTexture("rost_var", rost_type, 4, 1);
-  MakeStorageTextureBodyFunction("rost_func", "rost_var", ty.vec2<i32>(), {});
-
   MakeCallerBodyFunction("ep_func",
                          {"ub_func", "sb_func", "rosb_func", "s_func",
-                          "cs_func", "depth_ms_func", "st_func", "rost_func"},
+                          "cs_func", "depth_ms_func", "st_func"},
                          ast::DecorationList{
                              Stage(ast::PipelineStage::kFragment),
                          });
@@ -1287,7 +1282,7 @@ TEST_F(InspectorGetResourceBindingsTest, Simple) {
 
   auto result = inspector.GetResourceBindings("ep_func");
   ASSERT_FALSE(inspector.has_error()) << inspector.error();
-  ASSERT_EQ(10u, result.size());
+  ASSERT_EQ(9u, result.size());
 
   EXPECT_EQ(ResourceBinding::ResourceType::kUniformBuffer,
             result[0].resource_type);
@@ -1318,25 +1313,20 @@ TEST_F(InspectorGetResourceBindingsTest, Simple) {
   EXPECT_EQ(2u, result[5].bind_group);
   EXPECT_EQ(0u, result[5].binding);
 
-  EXPECT_EQ(ResourceBinding::ResourceType::kReadOnlyStorageTexture,
+  EXPECT_EQ(ResourceBinding::ResourceType::kWriteOnlyStorageTexture,
             result[6].resource_type);
   EXPECT_EQ(4u, result[6].bind_group);
-  EXPECT_EQ(1u, result[6].binding);
-
-  EXPECT_EQ(ResourceBinding::ResourceType::kWriteOnlyStorageTexture,
-            result[7].resource_type);
-  EXPECT_EQ(4u, result[7].bind_group);
-  EXPECT_EQ(0u, result[7].binding);
+  EXPECT_EQ(0u, result[6].binding);
 
   EXPECT_EQ(ResourceBinding::ResourceType::kDepthTexture,
-            result[8].resource_type);
-  EXPECT_EQ(3u, result[8].bind_group);
-  EXPECT_EQ(1u, result[8].binding);
+            result[7].resource_type);
+  EXPECT_EQ(3u, result[7].bind_group);
+  EXPECT_EQ(1u, result[7].binding);
 
   EXPECT_EQ(ResourceBinding::ResourceType::kDepthMultisampledTexture,
-            result[9].resource_type);
-  EXPECT_EQ(3u, result[9].bind_group);
-  EXPECT_EQ(3u, result[9].binding);
+            result[8].resource_type);
+  EXPECT_EQ(3u, result[8].bind_group);
+  EXPECT_EQ(3u, result[8].binding);
 }
 
 TEST_F(InspectorGetUniformBufferResourceBindingsTest, MissingEntryPoint) {
@@ -2358,20 +2348,15 @@ TEST_F(InspectorGetStorageTextureResourceBindingsTest, Empty) {
 
   Inspector& inspector = Build();
 
-  auto result = inspector.GetReadOnlyStorageTextureResourceBindings("ep");
-  ASSERT_FALSE(inspector.has_error()) << inspector.error();
-  EXPECT_EQ(0u, result.size());
-
-  result = inspector.GetWriteOnlyStorageTextureResourceBindings("ep");
+  auto result = inspector.GetWriteOnlyStorageTextureResourceBindings("ep");
   ASSERT_FALSE(inspector.has_error()) << inspector.error();
   EXPECT_EQ(0u, result.size());
 }
 
 TEST_P(InspectorGetStorageTextureResourceBindingsTestWithParam, Simple) {
-  bool read_only;
   DimensionParams dim_params;
   ImageFormatParams format_params;
-  std::tie(read_only, dim_params, format_params) = GetParam();
+  std::tie(dim_params, format_params) = GetParam();
 
   ast::TextureDimension dim;
   ResourceBinding::TextureDimension expected_dim;
@@ -2382,7 +2367,7 @@ TEST_P(InspectorGetStorageTextureResourceBindingsTestWithParam, Simple) {
   ResourceBinding::SampledKind expected_kind;
   std::tie(format, expected_format, expected_kind) = format_params;
 
-  auto* st_type = MakeStorageTextureTypes(dim, format, read_only);
+  auto* st_type = MakeStorageTextureTypes(dim, format);
   AddStorageTexture("st_var", st_type, 0, 0);
 
   ast::Type* dim_type = nullptr;
@@ -2409,33 +2394,23 @@ TEST_P(InspectorGetStorageTextureResourceBindingsTestWithParam, Simple) {
 
   Inspector& inspector = Build();
 
-  auto result =
-      read_only ? inspector.GetReadOnlyStorageTextureResourceBindings("ep")
-                : inspector.GetWriteOnlyStorageTextureResourceBindings("ep");
+  auto result = inspector.GetWriteOnlyStorageTextureResourceBindings("ep");
   ASSERT_FALSE(inspector.has_error()) << inspector.error();
   ASSERT_EQ(1u, result.size());
 
-  EXPECT_EQ(read_only ? ResourceBinding::ResourceType::kReadOnlyStorageTexture
-                      : ResourceBinding::ResourceType::kWriteOnlyStorageTexture,
+  EXPECT_EQ(ResourceBinding::ResourceType::kWriteOnlyStorageTexture,
             result[0].resource_type);
   EXPECT_EQ(0u, result[0].bind_group);
   EXPECT_EQ(0u, result[0].binding);
   EXPECT_EQ(expected_dim, result[0].dim);
   EXPECT_EQ(expected_format, result[0].image_format);
   EXPECT_EQ(expected_kind, result[0].sampled_kind);
-
-  result = read_only
-               ? inspector.GetWriteOnlyStorageTextureResourceBindings("ep")
-               : inspector.GetReadOnlyStorageTextureResourceBindings("ep");
-  ASSERT_FALSE(inspector.has_error()) << inspector.error();
-  ASSERT_EQ(0u, result.size());
 }
 
 INSTANTIATE_TEST_SUITE_P(
     InspectorGetStorageTextureResourceBindingsTest,
     InspectorGetStorageTextureResourceBindingsTestWithParam,
     testing::Combine(
-        testing::Bool(),
         testing::Values(
             std::make_tuple(ast::TextureDimension::k1d,
                             ResourceBinding::TextureDimension::k1d),
diff --git a/src/inspector/resource_binding.h b/src/inspector/resource_binding.h
index f107626f10..6558019b02 100644
--- a/src/inspector/resource_binding.h
+++ b/src/inspector/resource_binding.h
@@ -96,7 +96,6 @@ struct ResourceBinding {
     kComparisonSampler,
     kSampledTexture,
     kMultisampledTexture,
-    kReadOnlyStorageTexture,
     kWriteOnlyStorageTexture,
     kDepthTexture,
     kDepthMultisampledTexture,
diff --git a/src/inspector/test_inspector_builder.cc b/src/inspector/test_inspector_builder.cc
index ad048af4af..b364218dea 100644
--- a/src/inspector/test_inspector_builder.cc
+++ b/src/inspector/test_inspector_builder.cc
@@ -318,10 +318,8 @@ ast::Type* InspectorBuilder::GetCoordsType(ast::TextureDimension dim,
 }
 
 ast::Type* InspectorBuilder::MakeStorageTextureTypes(ast::TextureDimension dim,
-                                                     ast::ImageFormat format,
-                                                     bool read_only) {
-  auto access = read_only ? ast::Access::kRead : ast::Access::kWrite;
-  return ty.storage_texture(dim, format, access);
+                                                     ast::ImageFormat format) {
+  return ty.storage_texture(dim, format, ast::Access::kWrite);
 }
 
 void InspectorBuilder::AddStorageTexture(const std::string& name,
diff --git a/src/inspector/test_inspector_builder.h b/src/inspector/test_inspector_builder.h
index 6d9554b1f6..faa69a4505 100644
--- a/src/inspector/test_inspector_builder.h
+++ b/src/inspector/test_inspector_builder.h
@@ -329,11 +329,9 @@ class InspectorBuilder : public ProgramBuilder {
   /// Generates appropriate types for a Read-Only StorageTexture
   /// @param dim the texture dimension of the storage texture
   /// @param format the image format of the storage texture
-  /// @param read_only should the access type be read only, otherwise write only
   /// @returns the storage texture type
   ast::Type* MakeStorageTextureTypes(ast::TextureDimension dim,
-                                     ast::ImageFormat format,
-                                     bool read_only);
+                                     ast::ImageFormat format);
 
   /// Adds a storage texture variable to the program
   /// @param name the name of the variable
diff --git a/src/intrinsic_table.inl b/src/intrinsic_table.inl
index 2ba36e395e..d381fa22c0 100644
--- a/src/intrinsic_table.inl
+++ b/src/intrinsic_table.inl
@@ -1356,9 +1356,9 @@ std::string U32TexelFormat::String(MatchState&) const {
   return "rgba8uint, rgba16uint, r32uint, rg32uint or rgba32uint";
 }
 
-/// EnumMatcher for 'match read_or_write'
+/// EnumMatcher for 'match write_only'
 /// @see src/intrinsics.def:131:7
-class ReadOrWrite : public NumberMatcher {
+class WriteOnly : public NumberMatcher {
  public:
   /// Checks whether the given number matches the enum matcher rules.
   /// Match may close open types and numbers in state.
@@ -1371,18 +1371,15 @@ class ReadOrWrite : public NumberMatcher {
   std::string String(MatchState& state) const override;
 };
 
-Number ReadOrWrite::Match(MatchState&, Number number) const {
-  switch (static_cast<Access>(number.Value())) {
-    case Access::kRead:
-    case Access::kWrite:
-      return number;
-    default:
-      return Number::invalid;
+Number WriteOnly::Match(MatchState&, Number number) const {
+  if (number.IsAny() || number.Value() == static_cast<uint32_t>(Access::kWrite)) {
+    return Number(static_cast<uint32_t>(Access::kWrite));
   }
+  return Number::invalid;
 }
 
-std::string ReadOrWrite::String(MatchState&) const {
-  return "read or write";
+std::string WriteOnly::String(MatchState&) const {
+  return "write";
 }
 
 /// EnumMatcher for 'match function_private_workgroup'
@@ -1494,31 +1491,6 @@ std::string Write::String(MatchState&) const {
   return "write";
 }
 
-/// EnumMatcher for 'match read'
-class Read : public NumberMatcher {
- public:
-  /// Checks whether the given number matches the enum matcher rules.
-  /// Match may close open types and numbers in state.
-  /// @param state the MatchState
-  /// @param number the enum value as a Number
-  /// @return true if the enum value matches the set
-  Number Match(MatchState& state, Number number) const override;
-  /// @param state the MatchState
-  /// @return a string representation of the matcher.
-  std::string String(MatchState& state) const override;
-};
-
-Number Read::Match(MatchState&, Number number) const {
-  if (number.IsAny() || number.Value() == static_cast<uint32_t>(Access::kRead)) {
-    return Number(static_cast<uint32_t>(Access::kRead));
-  }
-  return Number::invalid;
-}
-
-std::string Read::String(MatchState&) const {
-  return "read";
-}
-
 /// EnumMatcher for 'match read_write'
 class ReadWrite : public NumberMatcher {
  public:
@@ -1591,12 +1563,11 @@ class Matchers {
   F32TexelFormat F32TexelFormat_;
   I32TexelFormat I32TexelFormat_;
   U32TexelFormat U32TexelFormat_;
-  ReadOrWrite ReadOrWrite_;
+  WriteOnly WriteOnly_;
   FunctionPrivateWorkgroup FunctionPrivateWorkgroup_;
   WorkgroupOrStorage WorkgroupOrStorage_;
   Storage Storage_;
   Write Write_;
-  Read Read_;
   ReadWrite ReadWrite_;
 
  public:
@@ -1649,19 +1620,18 @@ class Matchers {
   };
 
   /// The open-numbers, and number matchers
-  NumberMatcher const* const number[12] = {
+  NumberMatcher const* const number[11] = {
     /* [0] */ &open_number_0_,
     /* [1] */ &open_number_1_,
     /* [2] */ &F32TexelFormat_,
     /* [3] */ &I32TexelFormat_,
     /* [4] */ &U32TexelFormat_,
-    /* [5] */ &ReadOrWrite_,
+    /* [5] */ &WriteOnly_,
     /* [6] */ &FunctionPrivateWorkgroup_,
     /* [7] */ &WorkgroupOrStorage_,
     /* [8] */ &Storage_,
     /* [9] */ &Write_,
-    /* [10] */ &Read_,
-    /* [11] */ &ReadWrite_,
+    /* [10] */ &ReadWrite_,
   };
 };
 
@@ -1669,181 +1639,145 @@ Matchers::Matchers() = default;
 Matchers::~Matchers() = default;
 
 constexpr MatcherIndex kMatcherIndices[] = {
-  /* [0] */ 30,
-  /* [1] */ 4,
-  /* [2] */ 10,
+  /* [0] */ 10,
+  /* [1] */ 0,
+  /* [2] */ 11,
   /* [3] */ 0,
-  /* [4] */ 11,
-  /* [5] */ 0,
-  /* [6] */ 11,
-  /* [7] */ 10,
-  /* [8] */ 8,
-  /* [9] */ 12,
-  /* [10] */ 0,
+  /* [4] */ 10,
+  /* [5] */ 8,
+  /* [6] */ 12,
+  /* [7] */ 0,
+  /* [8] */ 0,
+  /* [9] */ 9,
+  /* [10] */ 1,
   /* [11] */ 0,
-  /* [12] */ 9,
-  /* [13] */ 1,
+  /* [12] */ 2,
+  /* [13] */ 9,
   /* [14] */ 0,
-  /* [15] */ 2,
-  /* [16] */ 9,
-  /* [17] */ 0,
-  /* [18] */ 1,
-  /* [19] */ 2,
-  /* [20] */ 9,
-  /* [21] */ 0,
+  /* [15] */ 1,
+  /* [16] */ 2,
+  /* [17] */ 9,
+  /* [18] */ 0,
+  /* [19] */ 0,
+  /* [20] */ 2,
+  /* [21] */ 8,
   /* [22] */ 0,
   /* [23] */ 2,
   /* [24] */ 8,
   /* [25] */ 0,
-  /* [26] */ 0,
-  /* [27] */ 8,
+  /* [26] */ 1,
+  /* [27] */ 29,
   /* [28] */ 0,
-  /* [29] */ 2,
-  /* [30] */ 8,
+  /* [29] */ 1,
+  /* [30] */ 30,
   /* [31] */ 0,
   /* [32] */ 1,
-  /* [33] */ 29,
+  /* [33] */ 28,
   /* [34] */ 0,
   /* [35] */ 1,
-  /* [36] */ 30,
+  /* [36] */ 27,
   /* [37] */ 0,
   /* [38] */ 1,
-  /* [39] */ 28,
+  /* [39] */ 8,
   /* [40] */ 0,
-  /* [41] */ 1,
+  /* [41] */ 0,
   /* [42] */ 27,
-  /* [43] */ 0,
-  /* [44] */ 1,
-  /* [45] */ 29,
+  /* [43] */ 3,
+  /* [44] */ 9,
+  /* [45] */ 30,
   /* [46] */ 4,
-  /* [47] */ 10,
-  /* [48] */ 28,
+  /* [47] */ 9,
+  /* [48] */ 29,
   /* [49] */ 4,
-  /* [50] */ 10,
-  /* [51] */ 27,
+  /* [50] */ 9,
+  /* [51] */ 28,
   /* [52] */ 4,
-  /* [53] */ 10,
-  /* [54] */ 30,
-  /* [55] */ 3,
-  /* [56] */ 10,
-  /* [57] */ 29,
+  /* [53] */ 9,
+  /* [54] */ 27,
+  /* [55] */ 4,
+  /* [56] */ 9,
+  /* [57] */ 30,
   /* [58] */ 3,
-  /* [59] */ 10,
-  /* [60] */ 28,
+  /* [59] */ 9,
+  /* [60] */ 29,
   /* [61] */ 3,
-  /* [62] */ 10,
-  /* [63] */ 27,
+  /* [62] */ 9,
+  /* [63] */ 28,
   /* [64] */ 3,
-  /* [65] */ 10,
+  /* [65] */ 9,
   /* [66] */ 30,
   /* [67] */ 2,
-  /* [68] */ 10,
+  /* [68] */ 9,
   /* [69] */ 29,
   /* [70] */ 2,
-  /* [71] */ 10,
+  /* [71] */ 9,
   /* [72] */ 28,
   /* [73] */ 2,
-  /* [74] */ 10,
+  /* [74] */ 9,
   /* [75] */ 27,
   /* [76] */ 2,
-  /* [77] */ 10,
-  /* [78] */ 30,
-  /* [79] */ 4,
-  /* [80] */ 9,
-  /* [81] */ 29,
-  /* [82] */ 4,
-  /* [83] */ 9,
-  /* [84] */ 28,
-  /* [85] */ 4,
-  /* [86] */ 9,
-  /* [87] */ 27,
-  /* [88] */ 2,
-  /* [89] */ 9,
-  /* [90] */ 27,
-  /* [91] */ 4,
-  /* [92] */ 9,
-  /* [93] */ 28,
+  /* [77] */ 9,
+  /* [78] */ 8,
+  /* [79] */ 0,
+  /* [80] */ 3,
+  /* [81] */ 6,
+  /* [82] */ 2,
+  /* [83] */ 7,
+  /* [84] */ 2,
+  /* [85] */ 18,
+  /* [86] */ 2,
+  /* [87] */ 6,
+  /* [88] */ 3,
+  /* [89] */ 5,
+  /* [90] */ 3,
+  /* [91] */ 5,
+  /* [92] */ 2,
+  /* [93] */ 17,
   /* [94] */ 2,
-  /* [95] */ 9,
-  /* [96] */ 8,
-  /* [97] */ 0,
-  /* [98] */ 3,
-  /* [99] */ 30,
-  /* [100] */ 3,
-  /* [101] */ 9,
-  /* [102] */ 29,
-  /* [103] */ 3,
-  /* [104] */ 9,
-  /* [105] */ 28,
+  /* [95] */ 20,
+  /* [96] */ 2,
+  /* [97] */ 16,
+  /* [98] */ 2,
+  /* [99] */ 33,
+  /* [100] */ 0,
+  /* [101] */ 19,
+  /* [102] */ 2,
+  /* [103] */ 35,
+  /* [104] */ 0,
+  /* [105] */ 7,
   /* [106] */ 3,
-  /* [107] */ 9,
-  /* [108] */ 27,
-  /* [109] */ 3,
-  /* [110] */ 9,
-  /* [111] */ 29,
-  /* [112] */ 2,
-  /* [113] */ 9,
-  /* [114] */ 30,
-  /* [115] */ 2,
-  /* [116] */ 9,
-  /* [117] */ 7,
-  /* [118] */ 3,
-  /* [119] */ 7,
-  /* [120] */ 2,
-  /* [121] */ 5,
-  /* [122] */ 3,
-  /* [123] */ 6,
-  /* [124] */ 3,
-  /* [125] */ 7,
-  /* [126] */ 4,
-  /* [127] */ 33,
+  /* [107] */ 7,
+  /* [108] */ 4,
+  /* [109] */ 15,
+  /* [110] */ 0,
+  /* [111] */ 7,
+  /* [112] */ 0,
+  /* [113] */ 16,
+  /* [114] */ 0,
+  /* [115] */ 17,
+  /* [116] */ 0,
+  /* [117] */ 18,
+  /* [118] */ 0,
+  /* [119] */ 21,
+  /* [120] */ 0,
+  /* [121] */ 19,
+  /* [122] */ 0,
+  /* [123] */ 20,
+  /* [124] */ 0,
+  /* [125] */ 15,
+  /* [126] */ 2,
+  /* [127] */ 5,
   /* [128] */ 0,
-  /* [129] */ 5,
-  /* [130] */ 2,
-  /* [131] */ 6,
-  /* [132] */ 2,
-  /* [133] */ 15,
-  /* [134] */ 0,
-  /* [135] */ 7,
-  /* [136] */ 0,
-  /* [137] */ 16,
-  /* [138] */ 0,
-  /* [139] */ 17,
-  /* [140] */ 0,
-  /* [141] */ 20,
-  /* [142] */ 2,
-  /* [143] */ 35,
-  /* [144] */ 0,
-  /* [145] */ 19,
-  /* [146] */ 2,
-  /* [147] */ 18,
-  /* [148] */ 0,
-  /* [149] */ 21,
-  /* [150] */ 0,
-  /* [151] */ 18,
-  /* [152] */ 2,
-  /* [153] */ 17,
-  /* [154] */ 2,
-  /* [155] */ 16,
-  /* [156] */ 2,
-  /* [157] */ 19,
-  /* [158] */ 0,
-  /* [159] */ 20,
-  /* [160] */ 0,
-  /* [161] */ 15,
-  /* [162] */ 2,
-  /* [163] */ 5,
-  /* [164] */ 0,
-  /* [165] */ 13,
-  /* [166] */ 25,
-  /* [167] */ 24,
-  /* [168] */ 23,
-  /* [169] */ 22,
-  /* [170] */ 14,
-  /* [171] */ 26,
-  /* [172] */ 31,
-  /* [173] */ 32,
-  /* [174] */ 34,
+  /* [129] */ 13,
+  /* [130] */ 22,
+  /* [131] */ 23,
+  /* [132] */ 24,
+  /* [133] */ 25,
+  /* [134] */ 26,
+  /* [135] */ 31,
+  /* [136] */ 14,
+  /* [137] */ 32,
+  /* [138] */ 34,
 };
 
 // Assert that the MatcherIndex is big enough to index all the matchers, plus
@@ -1856,3057 +1790,2922 @@ constexpr ParameterInfo kParameters[] = {
   {
     /* [0] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [1] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [2] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [3] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [4] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [5] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [6] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [7] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [8] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [9] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [10] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [11] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [12] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [13] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [14] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [15] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [16] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [17] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [18] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [19] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [20] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [21] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [22] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [23] */
     /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [24] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [25] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [26] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [27] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [28] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [29] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [30] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [31] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
+    /* matcher indices */ &kMatcherIndices[95],
   },
   {
     /* [32] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [33] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [34] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [35] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [36] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[123],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [37] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [38] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [39] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [40] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [41] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [42] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [43] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[141],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [44] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [45] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [46] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [47] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [48] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [49] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [50] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [51] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [52] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [53] */
     /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [54] */
     /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [55] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [56] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [57] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [58] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [59] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [60] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [61] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[95],
   },
   {
     /* [62] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [63] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [64] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [65] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [66] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [67] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [68] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [69] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [70] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [71] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [72] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [73] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [74] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [75] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [76] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [77] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [78] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [79] */
     /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [80] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [81] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [82] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [83] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [84] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [85] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[123],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [86] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[141],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [87] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [88] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [89] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [90] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [91] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[141],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [92] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [93] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [94] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [95] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [96] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[145],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [97] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [98] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [99] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [100] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [101] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [102] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [103] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [104] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [105] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [106] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [107] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [108] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [109] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [110] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [111] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [112] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [113] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [114] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [115] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [116] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[95],
   },
   {
     /* [117] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [118] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [119] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [120] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [121] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [122] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [123] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [124] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [125] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [126] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [127] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [128] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [129] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [130] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [131] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [132] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [133] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [134] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [135] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [136] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [137] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [138] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [139] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [140] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [141] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
+    /* matcher indices */ &kMatcherIndices[101],
   },
   {
     /* [142] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [143] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [144] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdx,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [145] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDdy,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [146] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [147] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [148] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [149] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [150] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [151] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [152] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [153] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [154] */
-    /* usage */ ParameterUsage::kDdx,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [155] */
-    /* usage */ ParameterUsage::kDdy,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [156] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [157] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [158] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [159] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [160] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[123],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [161] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [162] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [163] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [164] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [165] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [166] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [167] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [168] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [169] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [170] */
     /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [171] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[69],
   },
   {
     /* [172] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [173] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [174] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[83],
   },
   {
     /* [175] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[167],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [176] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [177] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [178] */
     /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [179] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[167],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [180] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [181] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [182] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [183] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[101],
   },
   {
     /* [184] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [185] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [186] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [187] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[139],
+    /* matcher indices */ &kMatcherIndices[48],
   },
   {
     /* [188] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [189] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [190] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
   },
   {
     /* [191] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[145],
+    /* matcher indices */ &kMatcherIndices[133],
   },
   {
     /* [192] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [193] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [194] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [195] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[81],
+    /* matcher indices */ &kMatcherIndices[60],
   },
   {
     /* [196] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [197] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [198] */
     /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[125],
+    /* matcher indices */ &kMatcherIndices[105],
   },
   {
     /* [199] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[167],
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [200] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [201] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [202] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [203] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [204] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [205] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [206] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [207] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
+    /* matcher indices */ &kMatcherIndices[131],
   },
   {
     /* [208] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [209] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [210] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [211] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[102],
+    /* matcher indices */ &kMatcherIndices[93],
   },
   {
     /* [212] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [213] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [214] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[117],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [215] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [216] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[170],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [217] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [218] */
-    /* usage */ ParameterUsage::kDepthRef,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [219] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [220] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [221] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [222] */
-    /* usage */ ParameterUsage::kBias,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [223] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [224] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [225] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [226] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [227] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
-  },
-  {
-    /* [228] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [229] */
-    /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[131],
   },
   {
-    /* [230] */
+    /* [228] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[89],
+  },
+  {
+    /* [229] */
     /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [230] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [231] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[145],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [232] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [233] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [234] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* usage */ ParameterUsage::kBias,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [235] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [236] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [237] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [238] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kOffset,
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
     /* [239] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[111],
+    /* matcher indices */ &kMatcherIndices[95],
   },
   {
     /* [240] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [241] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [242] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[119],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [243] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
     /* [244] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [245] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [246] */
     /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [247] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[141],
+    /* matcher indices */ &kMatcherIndices[132],
   },
   {
     /* [248] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [249] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [250] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [251] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[153],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
     /* [252] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[136],
   },
   {
     /* [253] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [254] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kDepthRef,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [255] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
+    /* matcher indices */ &kMatcherIndices[115],
   },
   {
     /* [256] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
     /* [257] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* usage */ ParameterUsage::kArrayIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [258] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
     /* [259] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
     /* [260] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [261] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [262] */
     /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [263] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
+    /* matcher indices */ &kMatcherIndices[101],
   },
   {
     /* [264] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
     /* [265] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
     /* [266] */
-    /* usage */ ParameterUsage::kOffset,
-    /* matcher indices */ &kMatcherIndices[123],
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [267] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [268] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [269] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [270] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[87],
-  },
-  {
-    /* [271] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [272] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[119],
-  },
-  {
-    /* [273] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[93],
-  },
-  {
-    /* [274] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [275] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[119],
-  },
-  {
-    /* [276] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [277] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [278] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [279] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [280] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [281] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [282] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[114],
-  },
-  {
-    /* [283] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[123],
-  },
-  {
-    /* [284] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[119],
-  },
-  {
-    /* [285] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[108],
-  },
-  {
-    /* [286] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [287] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[117],
-  },
-  {
-    /* [288] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [289] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [290] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [291] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[105],
-  },
-  {
-    /* [292] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [293] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[117],
-  },
-  {
-    /* [294] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[99],
-  },
-  {
-    /* [295] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[123],
-  },
-  {
-    /* [296] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[117],
-  },
-  {
-    /* [297] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[90],
-  },
-  {
-    /* [298] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [299] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[125],
-  },
-  {
-    /* [300] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[78],
-  },
-  {
-    /* [301] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[123],
-  },
-  {
-    /* [302] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[125],
-  },
-  {
-    /* [303] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
-  },
-  {
-    /* [304] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [305] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [306] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[137],
-  },
-  {
-    /* [307] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [308] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [309] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[84],
-  },
-  {
-    /* [310] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [311] */
-    /* usage */ ParameterUsage::kValue,
-    /* matcher indices */ &kMatcherIndices[125],
-  },
-  {
-    /* [312] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[161],
-  },
-  {
-    /* [313] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [314] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [315] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[147],
-  },
-  {
-    /* [316] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[123],
-  },
-  {
-    /* [317] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [318] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[149],
-  },
-  {
-    /* [319] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [320] */
-    /* usage */ ParameterUsage::kSampleIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [321] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
-  },
-  {
-    /* [322] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [323] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [324] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[171],
-  },
-  {
-    /* [325] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [326] */
-    /* usage */ ParameterUsage::kSampleIndex,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [327] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
-  },
-  {
-    /* [328] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [329] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [330] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[155],
-  },
-  {
-    /* [331] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [332] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[129],
-  },
-  {
-    /* [333] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[151],
-  },
-  {
-    /* [334] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [335] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
-  },
-  {
-    /* [336] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[145],
-  },
-  {
-    /* [337] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [338] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
-  },
-  {
-    /* [339] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[167],
-  },
-  {
-    /* [340] */
-    /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [341] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[131],
-  },
-  {
-    /* [342] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[45],
   },
   {
-    /* [343] */
+    /* [268] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
-    /* [344] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* [269] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
   },
   {
-    /* [345] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [346] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [347] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [348] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [349] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [350] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [351] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [352] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [353] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [354] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [355] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [356] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [357] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [358] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [359] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [360] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [361] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [362] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [363] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [364] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [365] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [366] */
+    /* [270] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[57],
+    /* matcher indices */ &kMatcherIndices[109],
   },
   {
-    /* [367] */
+    /* [271] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
-    /* [368] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* [272] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
-    /* [369] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [370] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [371] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[30],
-  },
-  {
-    /* [372] */
+    /* [273] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[69],
+    /* matcher indices */ &kMatcherIndices[113],
   },
   {
-    /* [373] */
+    /* [274] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
-    /* [374] */
-    /* usage */ ParameterUsage::kArrayIndex,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* [275] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
-    /* [375] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [376] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [377] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[13],
-  },
-  {
-    /* [378] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [379] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [380] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[13],
-  },
-  {
-    /* [381] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [382] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [383] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [384] */
+    /* [276] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[172],
+    /* matcher indices */ &kMatcherIndices[85],
   },
   {
-    /* [385] */
+    /* [277] */
     /* usage */ ParameterUsage::kSampler,
-    /* matcher indices */ &kMatcherIndices[165],
-  },
-  {
-    /* [386] */
-    /* usage */ ParameterUsage::kCoords,
     /* matcher indices */ &kMatcherIndices[129],
   },
   {
-    /* [387] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[72],
-  },
-  {
-    /* [388] */
+    /* [278] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
-    /* [389] */
+    /* [279] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[63],
+    /* matcher indices */ &kMatcherIndices[117],
   },
   {
-    /* [390] */
+    /* [280] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
-    /* [391] */
+    /* [281] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [282] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[60],
+    /* matcher indices */ &kMatcherIndices[101],
   },
   {
-    /* [392] */
+    /* [283] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [284] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[81],
   },
   {
-    /* [393] */
+    /* [285] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
-    /* [394] */
+    /* [286] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
-    /* [395] */
+    /* [287] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
-    /* [396] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [397] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [398] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [399] */
+    /* [288] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[66],
+    /* matcher indices */ &kMatcherIndices[119],
   },
   {
-    /* [400] */
+    /* [289] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[123],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
-    /* [401] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[131],
+    /* [290] */
+    /* usage */ ParameterUsage::kSampleIndex,
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
-    /* [402] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[131],
-  },
-  {
-    /* [403] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [404] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[96],
-  },
-  {
-    /* [405] */
+    /* [291] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[51],
   },
   {
-    /* [406] */
+    /* [292] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
-    /* [407] */
+    /* [293] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
+  },
+  {
+    /* [294] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[48],
+    /* matcher indices */ &kMatcherIndices[130],
   },
   {
-    /* [408] */
+    /* [295] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
-    /* [409] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[159],
-  },
-  {
-    /* [410] */
+    /* [296] */
     /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
-    /* [411] */
+    /* [297] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [412] */
+    /* [298] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [413] */
+    /* [299] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [414] */
+    /* [300] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [415] */
+    /* [301] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [416] */
+    /* [302] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [417] */
+    /* [303] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [418] */
+    /* [304] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [419] */
+    /* [305] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [420] */
+    /* [306] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [421] */
+    /* [307] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
+  },
+  {
+    /* [308] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[10],
+  },
+  {
+    /* [309] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [310] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [311] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[10],
+  },
+  {
+    /* [312] */
     /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[130],
+  },
+  {
+    /* [313] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [314] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [315] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [316] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [317] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [318] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[134],
+  },
+  {
+    /* [319] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[89],
+  },
+  {
+    /* [320] */
+    /* usage */ ParameterUsage::kSampleIndex,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [321] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [322] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [323] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [324] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [325] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [326] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [327] */
+    /* usage */ ParameterUsage::kNone,
     /* matcher indices */ &kMatcherIndices[0],
   },
   {
-    /* [422] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[123],
-  },
-  {
-    /* [423] */
+    /* [328] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
-    /* [424] */
+    /* [329] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
-    /* [425] */
+    /* [330] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [426] */
+    /* [331] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [427] */
+    /* [332] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
+    /* matcher indices */ &kMatcherIndices[24],
   },
   {
-    /* [428] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [429] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [430] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [431] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[172],
-  },
-  {
-    /* [432] */
-    /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[121],
-  },
-  {
-    /* [433] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [434] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [435] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [436] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [437] */
+    /* [333] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[54],
   },
   {
-    /* [438] */
+    /* [334] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[123],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
-    /* [439] */
+    /* [335] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[107],
+  },
+  {
+    /* [336] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[57],
+  },
+  {
+    /* [337] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[87],
+  },
+  {
+    /* [338] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[105],
+  },
+  {
+    /* [339] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [440] */
+    /* [340] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [441] */
+    /* [341] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [442] */
+    /* [342] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [343] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [344] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [345] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [443] */
+    /* [346] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [444] */
+    /* [347] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
-    /* [445] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [446] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [447] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [448] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [449] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [450] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [451] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [452] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [453] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [454] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [455] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [456] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [457] */
+    /* [348] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[75],
   },
   {
-    /* [458] */
+    /* [349] */
     /* usage */ ParameterUsage::kCoords,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[43],
   },
   {
-    /* [459] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* [350] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[83],
   },
   {
-    /* [460] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [461] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[137],
-  },
-  {
-    /* [462] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [463] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
-  },
-  {
-    /* [464] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [465] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[139],
-  },
-  {
-    /* [466] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [467] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[167],
-  },
-  {
-    /* [468] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [469] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[147],
-  },
-  {
-    /* [470] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
-  },
-  {
-    /* [471] */
+    /* [351] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [472] */
+    /* [352] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [473] */
+    /* [353] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [354] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[157],
+    /* matcher indices */ &kMatcherIndices[72],
   },
   {
-    /* [474] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* [355] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
-    /* [475] */
+    /* [356] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[83],
+  },
+  {
+    /* [357] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* matcher indices */ &kMatcherIndices[97],
   },
   {
-    /* [476] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* [358] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
   },
   {
-    /* [477] */
+    /* [359] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[91],
+  },
+  {
+    /* [360] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* matcher indices */ &kMatcherIndices[63],
   },
   {
-    /* [478] */
-    /* usage */ ParameterUsage::kLevel,
-    /* matcher indices */ &kMatcherIndices[55],
+    /* [361] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[89],
   },
   {
-    /* [479] */
+    /* [362] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[105],
+  },
+  {
+    /* [363] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[157],
+    /* matcher indices */ &kMatcherIndices[125],
   },
   {
-    /* [480] */
+    /* [364] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [365] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [366] */
     /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* matcher indices */ &kMatcherIndices[66],
   },
   {
-    /* [481] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[149],
+    /* [367] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[87],
   },
   {
-    /* [482] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* [368] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[83],
   },
   {
-    /* [483] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[159],
+    /* [369] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [484] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[167],
+    /* [370] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [485] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[147],
+    /* [371] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
-    /* [486] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
-  },
-  {
-    /* [487] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[139],
-  },
-  {
-    /* [488] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[171],
-  },
-  {
-    /* [489] */
+    /* [372] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[42],
   },
   {
-    /* [490] */
+    /* [373] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [374] */
+    /* usage */ ParameterUsage::kValue,
+    /* matcher indices */ &kMatcherIndices[105],
+  },
+  {
+    /* [375] */
     /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
+  },
+  {
+    /* [376] */
+    /* usage */ ParameterUsage::kSampler,
+    /* matcher indices */ &kMatcherIndices[129],
+  },
+  {
+    /* [377] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [378] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [379] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [380] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [381] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [382] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [383] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [384] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [385] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [386] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [387] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [388] */
+    /* usage */ ParameterUsage::kNone,
     /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [491] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[33],
+    /* [389] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
-    /* [492] */
+    /* [390] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [391] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [392] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [393] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[78],
+  },
+  {
+    /* [394] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [395] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [396] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[109],
+  },
+  {
+    /* [397] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [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[12],
+  },
+  {
+    /* [403] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [404] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [405] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[81],
+  },
+  {
+    /* [406] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [407] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [408] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [409] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [410] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [411] */
+    /* usage */ ParameterUsage::kCoords,
+    /* matcher indices */ &kMatcherIndices[89],
+  },
+  {
+    /* [412] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [413] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [414] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [415] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [416] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [417] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [418] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [419] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [420] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [421] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [422] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [423] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [424] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [425] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [426] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [427] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [428] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [429] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [430] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
+  },
+  {
+    /* [431] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [432] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
+  },
+  {
+    /* [433] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [434] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
+    /* [435] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [436] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[130],
+  },
+  {
+    /* [437] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [438] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[123],
+  },
+  {
+    /* [439] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [440] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[121],
+  },
+  {
+    /* [441] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [442] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[117],
+  },
+  {
+    /* [443] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [444] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [445] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [446] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
+  },
+  {
+    /* [447] */
+    /* usage */ ParameterUsage::kLevel,
+    /* matcher indices */ &kMatcherIndices[43],
+  },
+  {
+    /* [448] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[0],
+  },
+  {
+    /* [449] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
+  },
+  {
+    /* [450] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
+  },
+  {
+    /* [451] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
+  },
+  {
+    /* [452] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
+  },
+  {
+    /* [453] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[109],
+  },
+  {
+    /* [454] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[46],
+  },
+  {
+    /* [455] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[46],
+  },
+  {
+    /* [456] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [457] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[46],
+  },
+  {
+    /* [458] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[117],
+  },
+  {
+    /* [459] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[46],
+  },
+  {
+    /* [460] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[121],
+  },
+  {
+    /* [461] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[46],
+  },
+  {
+    /* [462] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[123],
+  },
+  {
+    /* [463] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [464] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[119],
+  },
+  {
+    /* [465] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[130],
+  },
+  {
+    /* [466] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [467] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
+    /* [468] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[13],
+  },
+  {
+    /* [469] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
+  },
+  {
+    /* [470] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [471] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
+  },
+  {
+    /* [472] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [473] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[134],
+  },
+  {
+    /* [474] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[36],
   },
   {
-    /* [493] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[172],
-  },
-  {
-    /* [494] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[139],
-  },
-  {
-    /* [495] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[159],
-  },
-  {
-    /* [496] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
-  },
-  {
-    /* [497] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
-  },
-  {
-    /* [498] */
+    /* [475] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[33],
   },
   {
-    /* [499] */
+    /* [476] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[27],
+  },
+  {
+    /* [477] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[30],
+  },
+  {
+    /* [478] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[135],
+  },
+  {
+    /* [479] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [480] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[123],
+  },
+  {
+    /* [481] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
+    /* [482] */
     /* usage */ ParameterUsage::kTexture,
     /* matcher indices */ &kMatcherIndices[133],
   },
+  {
+    /* [483] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[27],
+  },
+  {
+    /* [484] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[109],
+  },
+  {
+    /* [485] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[113],
+  },
+  {
+    /* [486] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[115],
+  },
+  {
+    /* [487] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[117],
+  },
+  {
+    /* [488] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[121],
+  },
+  {
+    /* [489] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[123],
+  },
+  {
+    /* [490] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[130],
+  },
+  {
+    /* [491] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[131],
+  },
+  {
+    /* [492] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[132],
+  },
+  {
+    /* [493] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[133],
+  },
+  {
+    /* [494] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[119],
+  },
+  {
+    /* [495] */
+    /* usage */ ParameterUsage::kTexture,
+    /* matcher indices */ &kMatcherIndices[134],
+  },
+  {
+    /* [496] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [497] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
+  {
+    /* [498] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
+  },
+  {
+    /* [499] */
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
+  },
   {
     /* [500] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[137],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [501] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[139],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [502] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[147],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [503] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[157],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [504] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[159],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [505] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[169],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [506] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[168],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [507] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[167],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [508] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[166],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [509] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[149],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [510] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[171],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[83],
   },
   {
     /* [511] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[137],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[83],
   },
   {
     /* [512] */
-    /* usage */ ParameterUsage::kTexture,
-    /* matcher indices */ &kMatcherIndices[133],
+    /* usage */ ParameterUsage::kNone,
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [513] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [514] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[91],
   },
   {
     /* [515] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [516] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [517] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[1],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [518] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [519] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [520] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[16],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [521] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [522] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [523] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [524] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [525] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [526] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [527] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [528] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [529] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [530] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [531] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [532] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [533] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [534] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [535] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [536] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [537] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[119],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [538] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[119],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [539] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [540] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [541] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[129],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [542] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [543] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [544] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [545] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [546] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [547] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [548] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [549] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [550] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [551] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [552] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [553] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [554] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [555] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [556] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [557] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [558] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [559] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [560] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [561] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [562] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [563] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[17],
   },
   {
     /* [564] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [565] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[1],
   },
   {
     /* [566] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [567] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [568] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [569] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [570] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [571] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [572] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [573] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [574] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [575] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[0],
   },
   {
     /* [576] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [577] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[4],
   },
   {
     /* [578] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[24],
   },
   {
     /* [579] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[24],
   },
   {
     /* [580] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[21],
   },
   {
     /* [581] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
+    /* matcher indices */ &kMatcherIndices[12],
   },
   {
     /* [582] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
+    /* matcher indices */ &kMatcherIndices[39],
   },
   {
     /* [583] */
     /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [584] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [585] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [586] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [587] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [588] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [589] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [590] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[20],
-  },
-  {
-    /* [591] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [592] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
-  },
-  {
-    /* [593] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [594] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [595] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [596] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [597] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [598] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [599] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [600] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [601] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [602] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[2],
-  },
-  {
-    /* [603] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [604] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[7],
-  },
-  {
-    /* [605] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[30],
-  },
-  {
-    /* [606] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[30],
-  },
-  {
-    /* [607] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[27],
-  },
-  {
-    /* [608] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[15],
-  },
-  {
-    /* [609] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[24],
-  },
-  {
-    /* [610] */
-    /* usage */ ParameterUsage::kNone,
-    /* matcher indices */ &kMatcherIndices[3],
+    /* matcher indices */ &kMatcherIndices[1],
   },
 };
 
@@ -4974,8 +4773,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[512],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[453],
+    /* return matcher indices */ &kMatcherIndices[43],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -4986,8 +4785,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[477],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[396],
+    /* return matcher indices */ &kMatcherIndices[43],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -4998,8 +4797,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[511],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[452],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5010,8 +4809,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[461],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[446],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5022,8 +4821,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[487],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[456],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5034,8 +4833,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[465],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[444],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5046,8 +4845,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[485],
-    /* return matcher indices */ &kMatcherIndices[123],
+    /* parameters */ &kParameters[458],
+    /* return matcher indices */ &kMatcherIndices[87],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5058,8 +4857,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[469],
-    /* return matcher indices */ &kMatcherIndices[123],
+    /* parameters */ &kParameters[442],
+    /* return matcher indices */ &kMatcherIndices[87],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5070,8 +4869,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[479],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[460],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5082,8 +4881,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[473],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[440],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5094,8 +4893,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[483],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[462],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5106,8 +4905,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[409],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[438],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5118,8 +4917,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[481],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[464],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5130,8 +4929,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[480],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[465],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5142,8 +4941,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[459],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[436],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5154,8 +4953,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[482],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[467],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5166,8 +4965,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[475],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[434],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5178,8 +4977,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[484],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[469],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5190,8 +4989,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[467],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[432],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5202,8 +5001,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[486],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[471],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5214,8 +5013,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[463],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[430],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5226,8 +5025,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[488],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[473],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5238,8 +5037,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[489],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[474],
+    /* return matcher indices */ &kMatcherIndices[43],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5250,8 +5049,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[490],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[475],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5262,8 +5061,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[491],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[476],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5274,8 +5073,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[492],
-    /* return matcher indices */ &kMatcherIndices[123],
+    /* parameters */ &kParameters[477],
+    /* return matcher indices */ &kMatcherIndices[87],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5286,80 +5085,80 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[493],
-    /* return matcher indices */ &kMatcherIndices[121],
+    /* parameters */ &kParameters[478],
+    /* return matcher indices */ &kMatcherIndices[89],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [27] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num parameters */ 4,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[303],
-    /* return matcher indices */ &kMatcherIndices[135],
+    /* parameters */ &kParameters[259],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [28] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num parameters */ 5,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[306],
-    /* return matcher indices */ &kMatcherIndices[135],
+    /* parameters */ &kParameters[121],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [29] */
-    /* num parameters */ 4,
-    /* num open types */ 1,
+    /* num parameters */ 5,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[187],
-    /* return matcher indices */ &kMatcherIndices[135],
+    /* parameters */ &kParameters[126],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [30] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num parameters */ 6,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[315],
-    /* return matcher indices */ &kMatcherIndices[135],
+    /* parameters */ &kParameters[25],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [31] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num parameters */ 4,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[318],
-    /* return matcher indices */ &kMatcherIndices[135],
+    /* parameters */ &kParameters[243],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [32] */
-    /* num parameters */ 3,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[321],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[76],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5370,94 +5169,94 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[259],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[263],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [34] */
-    /* num parameters */ 3,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[324],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[61],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [35] */
-    /* num parameters */ 2,
+    /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[457],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[215],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
     /* [36] */
-    /* num parameters */ 2,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[387],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[146],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
     /* [37] */
-    /* num parameters */ 3,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[372],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[151],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
     /* [38] */
-    /* num parameters */ 2,
+    /* num parameters */ 6,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[399],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[43],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
     /* [39] */
-    /* num parameters */ 2,
+    /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[389],
-    /* return matcher indices */ &kMatcherIndices[117],
+    /* parameters */ &kParameters[199],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
     /* [40] */
-    /* num parameters */ 2,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[391],
-    /* return matcher indices */ &kMatcherIndices[117],
+    /* parameters */ &kParameters[161],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
     /* [41] */
@@ -5466,81 +5265,81 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[366],
-    /* return matcher indices */ &kMatcherIndices[117],
+    /* parameters */ &kParameters[342],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* is_deprecated */ false,
   },
   {
     /* [42] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[437],
-    /* return matcher indices */ &kMatcherIndices[117],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
-  },
-  {
-    /* [43] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[405],
-    /* return matcher indices */ &kMatcherIndices[125],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
-  },
-  {
-    /* [44] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[407],
-    /* return matcher indices */ &kMatcherIndices[125],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
-  },
-  {
-    /* [45] */
     /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[342],
-    /* return matcher indices */ &kMatcherIndices[125],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* parameters */ &kParameters[363],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [43] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[357],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [44] */
+    /* num parameters */ 4,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[203],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [45] */
+    /* num parameters */ 4,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[211],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
     /* [46] */
-    /* num parameters */ 2,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[421],
-    /* return matcher indices */ &kMatcherIndices[125],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ true,
+    /* parameters */ &kParameters[96],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
   },
   {
     /* [47] */
-    /* num parameters */ 2,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[431],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[276],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -5550,45 +5349,45 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[203],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[235],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [49] */
-    /* num parameters */ 5,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[76],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[282],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [50] */
-    /* num parameters */ 5,
+    /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[71],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[239],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [51] */
-    /* num parameters */ 6,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[7],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[312],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -5599,44 +5398,44 @@ constexpr OverloadInfo kOverloads[] = {
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
     /* parameters */ &kParameters[223],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [53] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[156],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [54] */
     /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[231],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[207],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [55] */
+    /* [54] */
     /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[86],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[131],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [55] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[375],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -5646,68 +5445,68 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[243],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[191],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [57] */
-    /* num parameters */ 5,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[101],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[348],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [58] */
-    /* num parameters */ 5,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[131],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[354],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [59] */
-    /* 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[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [60] */
     /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[179],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[171],
+    /* return matcher indices */ nullptr,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [60] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[366],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [61] */
-    /* num parameters */ 5,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[141],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[372],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -5718,313 +5517,13 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[384],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[360],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [63] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[312],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [64] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[330],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [65] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[255],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [66] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[251],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [67] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[116],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [68] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[333],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [69] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[263],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [70] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[336],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [71] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[247],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [72] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[327],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [73] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[171],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [74] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[235],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [75] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[106],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [76] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[339],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [77] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[227],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [78] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[270],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [79] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[273],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [80] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[239],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [81] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[282],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [82] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[285],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [83] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[291],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [84] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[211],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [85] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[294],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [86] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[297],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [87] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[309],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [88] */
     /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
@@ -6036,161 +5535,461 @@ constexpr OverloadInfo kOverloads[] = {
     /* is_deprecated */ false,
   },
   {
-    /* [89] */
+    /* [64] */
     /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[300],
+    /* parameters */ &kParameters[336],
     /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [90] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[499],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [91] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[500],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [92] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[501],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [93] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[502],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [94] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[503],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [95] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[504],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [96] */
-    /* num parameters */ 1,
+    /* [65] */
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[505],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[333],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [97] */
-    /* num parameters */ 1,
+    /* [66] */
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[506],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[291],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
-    /* [98] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[507],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [99] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[508],
-    /* return matcher indices */ &kMatcherIndices[55],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [100] */
+    /* [67] */
     /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[219],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[187],
+    /* return matcher indices */ nullptr,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [68] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[267],
+    /* return matcher indices */ nullptr,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [69] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[484],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [70] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[485],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [71] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[486],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [72] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[487],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [73] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[488],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [74] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[489],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [75] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[490],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [76] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[491],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [77] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[492],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [78] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[493],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [79] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[270],
+    /* return matcher indices */ &kMatcherIndices[111],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [80] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[273],
+    /* return matcher indices */ &kMatcherIndices[111],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [81] */
+    /* num parameters */ 4,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[255],
+    /* return matcher indices */ &kMatcherIndices[111],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [82] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[279],
+    /* return matcher indices */ &kMatcherIndices[111],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [83] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[288],
+    /* return matcher indices */ &kMatcherIndices[111],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [84] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[294],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [85] */
+    /* num parameters */ 4,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[227],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [86] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[318],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [87] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[410],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [88] */
+    /* num parameters */ 4,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[231],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [101] */
+    /* [89] */
     /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[66],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[166],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
+  {
+    /* [90] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[156],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [91] */
+    /* num parameters */ 6,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[13],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [92] */
+    /* num parameters */ 4,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[179],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [93] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[136],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [94] */
+    /* num parameters */ 4,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[183],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [95] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[116],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [96] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[86],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [97] */
+    /* 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,
+  },
+  {
+    /* [98] */
+    /* 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[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [99] */
+    /* 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,
+  },
+  {
+    /* [100] */
+    /* num parameters */ 5,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[106],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* 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[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
   {
     /* [102] */
     /* num parameters */ 5,
@@ -6198,9 +5997,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[161],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[141],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6210,9 +6009,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[25],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[31],
+    /* return matcher indices */ &kMatcherIndices[83],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6222,9 +6021,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[207],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[251],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6234,81 +6033,81 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[81],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[66],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* 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[71],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* 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[19],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* 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[191],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* 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[91],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [108] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[151],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[247],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [109] */
-    /* num parameters */ 6,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[55],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* parameters */ &kParameters[81],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [110] */
-    /* num parameters */ 6,
+    /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[49],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[175],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [111] */
-    /* num parameters */ 7,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[0],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[111],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6318,9 +6117,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[121],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[101],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6330,200 +6129,200 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[31],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[55],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [114] */
-    /* num parameters */ 5,
+    /* num parameters */ 4,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[96],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[219],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [115] */
-    /* num parameters */ 6,
+    /* num parameters */ 5,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[43],
-    /* return matcher indices */ &kMatcherIndices[119],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[91],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [116] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[215],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [117] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[166],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [118] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[136],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [119] */
-    /* num parameters */ 6,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[13],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [120] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[199],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [121] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[146],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [122] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[183],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [123] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[61],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [124] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[111],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [125] */
-    /* num parameters */ 6,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[19],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [126] */
-    /* num parameters */ 4,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[175],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [127] */
-    /* num parameters */ 5,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[126],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [128] */
     /* num parameters */ 1,
     /* num open types */ 1,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[494],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[479],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [117] */
+    /* num parameters */ 1,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[1],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[480],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [118] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[481],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [119] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[482],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [120] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 2,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[0],
+    /* parameters */ &kParameters[483],
+    /* return matcher indices */ &kMatcherIndices[43],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [121] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[345],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [122] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[369],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [123] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[351],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [124] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[3],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[309],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [125] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[3],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[306],
+    /* return matcher indices */ &kMatcherIndices[39],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [126] */
+    /* num parameters */ 3,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[3],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[330],
+    /* return matcher indices */ &kMatcherIndices[39],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [127] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[408],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [128] */
+    /* num parameters */ 2,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[406],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [129] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[495],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[499],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6531,132 +6330,132 @@ constexpr OverloadInfo kOverloads[] = {
     /* [130] */
     /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[496],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[498],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [131] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[497],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[402],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [132] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
-    /* num open numbers */ 2,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[0],
-    /* parameters */ &kParameters[498],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[400],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [133] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
+    /* num parameters */ 1,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[2],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[345],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[565],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [134] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
+    /* num parameters */ 1,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[2],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[348],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[564],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [135] */
-    /* num parameters */ 3,
+    /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 1,
+    /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[351],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[562],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [136] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[3],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[378],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[561],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [137] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[3],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[375],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [138] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[3],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[369],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [139] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[413],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[560],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
-    /* [140] */
-    /* num parameters */ 2,
+    /* [138] */
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[411],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[559],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [139] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[558],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [140] */
+    /* num parameters */ 1,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[557],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6666,9 +6465,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[526],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[556],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6678,57 +6477,57 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[525],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[555],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [143] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[415],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[554],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [144] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[417],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[553],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [145] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[2],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[592],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[552],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [146] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[591],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[551],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6738,9 +6537,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[589],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[550],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6750,9 +6549,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[588],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[549],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6762,9 +6561,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[587],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[548],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6774,9 +6573,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[586],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[547],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6786,9 +6585,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[585],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[567],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6798,9 +6597,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[584],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[566],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6810,9 +6609,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[583],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[546],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6822,33 +6621,33 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[582],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[545],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [155] */
-    /* num parameters */ 1,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[581],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[300],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [156] */
-    /* num parameters */ 1,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[580],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[297],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6858,9 +6657,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[579],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[544],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6870,9 +6669,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[578],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[543],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -6882,8 +6681,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[577],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[542],
+    /* return matcher indices */ &kMatcherIndices[138],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6894,8 +6693,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[576],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[541],
+    /* return matcher indices */ &kMatcherIndices[103],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -6906,9 +6705,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[575],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[540],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6918,9 +6717,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[574],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[539],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6930,9 +6729,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[594],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[538],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6942,9 +6741,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[593],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[537],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6954,9 +6753,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[573],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[536],
+    /* return matcher indices */ &kMatcherIndices[12],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
@@ -6966,32 +6765,32 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[572],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* parameters */ &kParameters[535],
+    /* return matcher indices */ &kMatcherIndices[21],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
     /* is_deprecated */ false,
   },
   {
     /* [167] */
-    /* num parameters */ 3,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[279],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[569],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [168] */
-    /* num parameters */ 3,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[276],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[568],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7002,8 +6801,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[571],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[533],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7014,8 +6813,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[570],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[532],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7026,8 +6825,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[569],
-    /* return matcher indices */ &kMatcherIndices[174],
+    /* parameters */ &kParameters[531],
+    /* return matcher indices */ &kMatcherIndices[10],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7038,8 +6837,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[568],
-    /* return matcher indices */ &kMatcherIndices[143],
+    /* parameters */ &kParameters[530],
+    /* return matcher indices */ &kMatcherIndices[24],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7050,9 +6849,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[567],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[529],
+    /* return matcher indices */ &kMatcherIndices[10],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7062,9 +6861,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[566],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[528],
+    /* return matcher indices */ &kMatcherIndices[24],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7074,9 +6873,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[565],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[527],
+    /* return matcher indices */ &kMatcherIndices[10],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7086,9 +6885,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[564],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[526],
+    /* return matcher indices */ &kMatcherIndices[24],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7098,9 +6897,9 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[563],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[525],
+    /* return matcher indices */ &kMatcherIndices[10],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7110,32 +6909,32 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[562],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment),
+    /* parameters */ &kParameters[524],
+    /* return matcher indices */ &kMatcherIndices[24],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [179] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[596],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[394],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [180] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[595],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[392],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7146,8 +6945,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[560],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[523],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7158,8 +6957,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[559],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[522],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7170,8 +6969,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[558],
-    /* return matcher indices */ &kMatcherIndices[13],
+    /* parameters */ &kParameters[521],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7182,8 +6981,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[557],
-    /* return matcher indices */ &kMatcherIndices[30],
+    /* parameters */ &kParameters[520],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7194,8 +6993,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[556],
-    /* return matcher indices */ &kMatcherIndices[13],
+    /* parameters */ &kParameters[519],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7206,80 +7005,80 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[555],
-    /* return matcher indices */ &kMatcherIndices[30],
+    /* parameters */ &kParameters[518],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [187] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num parameters */ 2,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[554],
-    /* return matcher indices */ &kMatcherIndices[13],
+    /* parameters */ &kParameters[390],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [188] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num parameters */ 2,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[553],
-    /* return matcher indices */ &kMatcherIndices[30],
+    /* parameters */ &kParameters[388],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [189] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num parameters */ 2,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[552],
-    /* return matcher indices */ &kMatcherIndices[13],
+    /* parameters */ &kParameters[384],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [190] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num parameters */ 2,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[551],
-    /* return matcher indices */ &kMatcherIndices[30],
+    /* parameters */ &kParameters[450],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [191] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
+    /* num parameters */ 3,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[471],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[285],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [192] */
-    /* num parameters */ 2,
-    /* num open types */ 0,
+    /* num parameters */ 3,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[403],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[303],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7290,8 +7089,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[550],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[517],
+    /* return matcher indices */ &kMatcherIndices[137],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7302,20 +7101,20 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[549],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[516],
+    /* return matcher indices */ &kMatcherIndices[99],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [195] */
     /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[548],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[494],
+    /* return matcher indices */ &kMatcherIndices[43],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7323,107 +7122,107 @@ constexpr OverloadInfo kOverloads[] = {
     /* [196] */
     /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 1,
+    /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[547],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[495],
+    /* return matcher indices */ &kMatcherIndices[43],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [197] */
-    /* num parameters */ 1,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[546],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[321],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [198] */
-    /* num parameters */ 1,
+    /* num parameters */ 3,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[545],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[324],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [199] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
+    /* num parameters */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[445],
-    /* return matcher indices */ &kMatcherIndices[3],
+    /* parameters */ &kParameters[501],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [200] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
+    /* num parameters */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[441],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[500],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [201] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
+    /* num parameters */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[429],
-    /* return matcher indices */ &kMatcherIndices[3],
+    /* parameters */ &kParameters[571],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [202] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
+    /* num parameters */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[419],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[570],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [203] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num parameters */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[363],
-    /* return matcher indices */ &kMatcherIndices[3],
+    /* parameters */ &kParameters[573],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [204] */
-    /* num parameters */ 3,
-    /* num open types */ 1,
+    /* num parameters */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[381],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[572],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7434,8 +7233,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[544],
-    /* return matcher indices */ &kMatcherIndices[173],
+    /* parameters */ &kParameters[466],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7446,56 +7245,56 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[543],
-    /* return matcher indices */ &kMatcherIndices[127],
+    /* parameters */ &kParameters[463],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [207] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num parameters */ 2,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[509],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* parameters */ &kParameters[414],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [208] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[510],
-    /* return matcher indices */ &kMatcherIndices[55],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[380],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [209] */
-    /* num parameters */ 3,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[360],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[472],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [210] */
-    /* num parameters */ 3,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[357],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[470],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7506,8 +7305,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[528],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[576],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7518,32 +7317,32 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[527],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[574],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [213] */
     /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[2],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[598],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[509],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [214] */
     /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[2],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[597],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[508],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7554,8 +7353,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[600],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[507],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7566,8 +7365,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[599],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[506],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7578,8 +7377,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[519],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[581],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7590,32 +7389,32 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[518],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[580],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [219] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[397],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[505],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [220] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[395],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[504],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7626,8 +7425,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[522],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[503],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7638,80 +7437,80 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[521],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[502],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [223] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[603],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[420],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [224] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[601],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[422],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [225] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[2],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[536],
-    /* return matcher indices */ &kMatcherIndices[3],
+    /* parameters */ &kParameters[497],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [226] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[535],
-    /* return matcher indices */ &kMatcherIndices[24],
+    /* parameters */ &kParameters[496],
+    /* 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 types */ 1,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[534],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[583],
+    /* return matcher indices */ &kMatcherIndices[1],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [228] */
     /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
+    /* open types */ &kOpenTypes[1],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[533],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[582],
+    /* return matcher indices */ &kMatcherIndices[39],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7722,44 +7521,44 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[608],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[513],
+    /* return matcher indices */ &kMatcherIndices[46],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [230] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[607],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [231] */
-    /* num parameters */ 1,
+    /* num parameters */ 0,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[532],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[584],
+    /* return matcher indices */ nullptr,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kCompute),
+    /* is_deprecated */ false,
+  },
+  {
+    /* [231] */
+    /* num parameters */ 3,
+    /* num open types */ 0,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[339],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [232] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[531],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[382],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7767,11 +7566,11 @@ constexpr OverloadInfo kOverloads[] = {
     /* [233] */
     /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 2,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[530],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* open numbers */ &kOpenNumbers[2],
+    /* parameters */ &kParameters[468],
+    /* return matcher indices */ &kMatcherIndices[9],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7779,35 +7578,35 @@ constexpr OverloadInfo kOverloads[] = {
     /* [234] */
     /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 1,
+    /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[529],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[510],
+    /* return matcher indices */ &kMatcherIndices[46],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [235] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[423],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[461],
+    /* return matcher indices */ &kMatcherIndices[91],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [236] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 1,
+    /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[425],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[459],
+    /* return matcher indices */ &kMatcherIndices[91],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7818,8 +7617,8 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[524],
-    /* return matcher indices */ &kMatcherIndices[15],
+    /* parameters */ &kParameters[457],
+    /* return matcher indices */ &kMatcherIndices[91],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7827,36 +7626,36 @@ constexpr OverloadInfo kOverloads[] = {
     /* [238] */
     /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 1,
+    /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[523],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[455],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [239] */
     /* num parameters */ 1,
-    /* num open types */ 1,
+    /* num open types */ 0,
     /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[1],
+    /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[610],
-    /* return matcher indices */ &kMatcherIndices[3],
+    /* parameters */ &kParameters[454],
+    /* return matcher indices */ &kMatcherIndices[83],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [240] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[1],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[609],
-    /* return matcher indices */ &kMatcherIndices[24],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* num parameters */ 0,
+    /* num open types */ 0,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[4],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[584],
+    /* return matcher indices */ nullptr,
+    /* supported_stages */ PipelineStageSet(PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
@@ -7866,80 +7665,80 @@ constexpr OverloadInfo kOverloads[] = {
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[540],
-    /* return matcher indices */ &kMatcherIndices[1],
+    /* parameters */ &kParameters[511],
+    /* return matcher indices */ &kMatcherIndices[46],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [242] */
-    /* num parameters */ 0,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[611],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kCompute),
+    /* parameters */ &kParameters[512],
+    /* return matcher indices */ &kMatcherIndices[46],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [243] */
-    /* num parameters */ 3,
+    /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 1,
+    /* num open numbers */ 0,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[267],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[514],
+    /* return matcher indices */ &kMatcherIndices[46],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [244] */
-    /* num parameters */ 2,
+    /* num parameters */ 1,
     /* num open types */ 0,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
     /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[393],
-    /* return matcher indices */ &kMatcherIndices[27],
+    /* parameters */ &kParameters[515],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [245] */
     /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 2,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[2],
-    /* parameters */ &kParameters[520],
-    /* return matcher indices */ &kMatcherIndices[12],
+    /* num open types */ 1,
+    /* num open numbers */ 0,
+    /* open types */ &kOpenTypes[0],
+    /* open numbers */ &kOpenNumbers[6],
+    /* parameters */ &kParameters[534],
+    /* return matcher indices */ nullptr,
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [246] */
-    /* num parameters */ 1,
+    /* num parameters */ 3,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[537],
-    /* return matcher indices */ &kMatcherIndices[1],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[315],
+    /* return matcher indices */ &kMatcherIndices[21],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [247] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[517],
-    /* return matcher indices */ &kMatcherIndices[129],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[398],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7947,35 +7746,35 @@ constexpr OverloadInfo kOverloads[] = {
     /* [248] */
     /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[516],
-    /* return matcher indices */ &kMatcherIndices[129],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[563],
+    /* return matcher indices */ &kMatcherIndices[12],
     /* 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[515],
-    /* return matcher indices */ &kMatcherIndices[129],
+    /* parameters */ &kParameters[404],
+    /* return matcher indices */ &kMatcherIndices[81],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [250] */
     /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[514],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[0],
+    /* open numbers */ &kOpenNumbers[5],
+    /* parameters */ &kParameters[577],
+    /* return matcher indices */ &kMatcherIndices[46],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -7983,299 +7782,155 @@ constexpr OverloadInfo kOverloads[] = {
     /* [251] */
     /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[513],
-    /* return matcher indices */ &kMatcherIndices[119],
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[578],
+    /* return matcher indices */ &kMatcherIndices[10],
     /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [252] */
-    /* num parameters */ 0,
+    /* num parameters */ 1,
     /* num open types */ 0,
-    /* num open numbers */ 0,
+    /* num open numbers */ 1,
     /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[611],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kCompute),
+    /* open numbers */ &kOpenNumbers[3],
+    /* parameters */ &kParameters[579],
+    /* return matcher indices */ &kMatcherIndices[10],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [253] */
     /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[538],
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[575],
     /* return matcher indices */ &kMatcherIndices[1],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [254] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[539],
-    /* return matcher indices */ &kMatcherIndices[1],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* num parameters */ 2,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[412],
+    /* return matcher indices */ nullptr,
+    /* supported_stages */ PipelineStageSet(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[541],
+    /* num parameters */ 2,
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[378],
     /* return matcher indices */ &kMatcherIndices[1],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [256] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num parameters */ 2,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[542],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[416],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [257] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 1,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[0],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[561],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[418],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [258] */
-    /* num parameters */ 3,
-    /* num open types */ 0,
+    /* num parameters */ 2,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[288],
-    /* return matcher indices */ &kMatcherIndices[27],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[426],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [259] */
     /* num parameters */ 2,
-    /* num open types */ 0,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[455],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[428],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [260] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
+    /* num parameters */ 2,
+    /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[590],
-    /* return matcher indices */ &kMatcherIndices[15],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[448],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [261] */
     /* num parameters */ 2,
-    /* num open types */ 0,
-    /* num open numbers */ 0,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[6],
-    /* parameters */ &kParameters[401],
-    /* return matcher indices */ &kMatcherIndices[131],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* num open types */ 1,
+    /* num open numbers */ 1,
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[386],
+    /* return matcher indices */ &kMatcherIndices[1],
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [262] */
-    /* num parameters */ 1,
+    /* num parameters */ 2,
     /* num open types */ 1,
     /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[0],
-    /* open numbers */ &kOpenNumbers[5],
-    /* parameters */ &kParameters[604],
+    /* open types */ &kOpenTypes[2],
+    /* open numbers */ &kOpenNumbers[4],
+    /* parameters */ &kParameters[424],
     /* return matcher indices */ &kMatcherIndices[1],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
+    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
   {
     /* [263] */
-    /* 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[13],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [264] */
-    /* num parameters */ 1,
-    /* num open types */ 0,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[4],
-    /* open numbers */ &kOpenNumbers[3],
-    /* parameters */ &kParameters[606],
-    /* return matcher indices */ &kMatcherIndices[13],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [265] */
-    /* num parameters */ 1,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[602],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [266] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[433],
-    /* return matcher indices */ nullptr,
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [267] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[435],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [268] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[439],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [269] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[443],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [270] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[447],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [271] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[449],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [272] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[451],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [273] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[453],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [274] */
-    /* num parameters */ 2,
-    /* num open types */ 1,
-    /* num open numbers */ 1,
-    /* open types */ &kOpenTypes[2],
-    /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[427],
-    /* return matcher indices */ &kMatcherIndices[3],
-    /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
-    /* is_deprecated */ false,
-  },
-  {
-    /* [275] */
     /* num parameters */ 3,
     /* num open types */ 1,
     /* num open numbers */ 1,
     /* open types */ &kOpenTypes[2],
     /* open numbers */ &kOpenNumbers[4],
-    /* parameters */ &kParameters[354],
-    /* return matcher indices */ &kMatcherIndices[163],
+    /* parameters */ &kParameters[327],
+    /* return matcher indices */ &kMatcherIndices[127],
     /* supported_stages */ PipelineStageSet(PipelineStage::kFragment, PipelineStage::kCompute),
     /* is_deprecated */ false,
   },
@@ -8287,307 +7942,307 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn abs<T : fiu32>(T) -> T */
     /* fn abs<N : num, T : fiu32>(vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[239],
+    /* overloads */ &kOverloads[227],
   },
   {
     /* [1] */
     /* fn acos(f32) -> f32 */
     /* fn acos<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[229],
+    /* overloads */ &kOverloads[217],
   },
   {
     /* [2] */
     /* fn all<N : num>(vec<N, bool>) -> bool */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[264],
+    /* overloads */ &kOverloads[252],
   },
   {
     /* [3] */
     /* fn any<N : num>(vec<N, bool>) -> bool */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[263],
+    /* overloads */ &kOverloads[251],
   },
   {
     /* [4] */
     /* fn arrayLength<T, A : access>(ptr<storage, array<T>, A>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[262],
+    /* overloads */ &kOverloads[250],
   },
   {
     /* [5] */
     /* fn asin(f32) -> f32 */
     /* fn asin<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[223],
+    /* overloads */ &kOverloads[211],
   },
   {
     /* [6] */
     /* fn atan(f32) -> f32 */
     /* fn atan<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[215],
+    /* overloads */ &kOverloads[203],
   },
   {
     /* [7] */
     /* fn atan2(f32, f32) -> f32 */
     /* fn atan2<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[139],
+    /* overloads */ &kOverloads[127],
   },
   {
     /* [8] */
     /* fn ceil(f32) -> f32 */
     /* fn ceil<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[213],
+    /* overloads */ &kOverloads[201],
   },
   {
     /* [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[203],
+    /* overloads */ &kOverloads[191],
   },
   {
     /* [10] */
     /* fn cos(f32) -> f32 */
     /* fn cos<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[179],
+    /* overloads */ &kOverloads[167],
   },
   {
     /* [11] */
     /* fn cosh(f32) -> f32 */
     /* fn cosh<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[163],
+    /* overloads */ &kOverloads[151],
   },
   {
     /* [12] */
     /* fn countOneBits<T : iu32>(T) -> T */
     /* fn countOneBits<N : num, T : iu32>(vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[145],
+    /* overloads */ &kOverloads[133],
   },
   {
     /* [13] */
     /* fn cross(vec3<f32>, vec3<f32>) -> vec3<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[261],
+    /* overloads */ &kOverloads[249],
   },
   {
     /* [14] */
     /* fn determinant<N : num>(mat<N, N, f32>) -> f32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[260],
+    /* overloads */ &kOverloads[248],
   },
   {
     /* [15] */
     /* fn distance(f32, f32) -> f32 */
     /* fn distance<N : num>(vec<N, f32>, vec<N, f32>) -> f32 */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[143],
+    /* overloads */ &kOverloads[131],
   },
   {
     /* [16] */
     /* fn dot<N : num>(vec<N, f32>, vec<N, f32>) -> f32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[259],
+    /* overloads */ &kOverloads[247],
   },
   {
     /* [17] */
     /* fn dpdx(f32) -> f32 */
     /* fn dpdx<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[147],
+    /* overloads */ &kOverloads[135],
   },
   {
     /* [18] */
     /* fn dpdxCoarse(f32) -> f32 */
     /* fn dpdxCoarse<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[149],
+    /* overloads */ &kOverloads[137],
   },
   {
     /* [19] */
     /* fn dpdxFine(f32) -> f32 */
     /* fn dpdxFine<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[151],
+    /* overloads */ &kOverloads[139],
   },
   {
     /* [20] */
     /* fn dpdy(f32) -> f32 */
     /* fn dpdy<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[153],
+    /* overloads */ &kOverloads[141],
   },
   {
     /* [21] */
     /* fn dpdyCoarse(f32) -> f32 */
     /* fn dpdyCoarse<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[155],
+    /* overloads */ &kOverloads[143],
   },
   {
     /* [22] */
     /* fn dpdyFine(f32) -> f32 */
     /* fn dpdyFine<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[157],
+    /* overloads */ &kOverloads[145],
   },
   {
     /* [23] */
     /* fn exp(f32) -> f32 */
     /* fn exp<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[159],
+    /* overloads */ &kOverloads[147],
   },
   {
     /* [24] */
     /* fn exp2(f32) -> f32 */
     /* fn exp2<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[161],
+    /* overloads */ &kOverloads[149],
   },
   {
     /* [25] */
     /* fn faceForward<N : num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[258],
+    /* overloads */ &kOverloads[246],
   },
   {
     /* [26] */
     /* fn floor(f32) -> f32 */
     /* fn floor<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[165],
+    /* overloads */ &kOverloads[153],
   },
   {
     /* [27] */
     /* fn fma(f32, f32, f32) -> f32 */
     /* fn fma<N : num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[167],
+    /* overloads */ &kOverloads[155],
   },
   {
     /* [28] */
     /* fn fract(f32) -> f32 */
     /* fn fract<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[169],
+    /* overloads */ &kOverloads[157],
   },
   {
     /* [29] */
     /* fn frexp(f32) -> _frexp_result */
     /* fn frexp<N : num>(vec<N, f32>) -> _frexp_result_vec<N> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[171],
+    /* overloads */ &kOverloads[159],
   },
   {
     /* [30] */
     /* fn fwidth(f32) -> f32 */
     /* fn fwidth<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[173],
+    /* overloads */ &kOverloads[161],
   },
   {
     /* [31] */
     /* fn fwidthCoarse(f32) -> f32 */
     /* fn fwidthCoarse<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[175],
+    /* overloads */ &kOverloads[163],
   },
   {
     /* [32] */
     /* fn fwidthFine(f32) -> f32 */
     /* fn fwidthFine<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[177],
+    /* overloads */ &kOverloads[165],
   },
   {
     /* [33] */
     /* fn ignore<T>(T) */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[257],
+    /* overloads */ &kOverloads[245],
   },
   {
     /* [34] */
     /* fn inverseSqrt(f32) -> f32 */
     /* fn inverseSqrt<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[181],
+    /* overloads */ &kOverloads[169],
   },
   {
     /* [35] */
     /* fn isFinite(f32) -> bool */
     /* fn isFinite<N : num>(vec<N, f32>) -> vec<N, bool> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[183],
+    /* overloads */ &kOverloads[171],
   },
   {
     /* [36] */
     /* fn isInf(f32) -> bool */
     /* fn isInf<N : num>(vec<N, f32>) -> vec<N, bool> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[185],
+    /* overloads */ &kOverloads[173],
   },
   {
     /* [37] */
     /* fn isNan(f32) -> bool */
     /* fn isNan<N : num>(vec<N, f32>) -> vec<N, bool> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[187],
+    /* overloads */ &kOverloads[175],
   },
   {
     /* [38] */
     /* fn isNormal(f32) -> bool */
     /* fn isNormal<N : num>(vec<N, f32>) -> vec<N, bool> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[189],
+    /* overloads */ &kOverloads[177],
   },
   {
     /* [39] */
     /* fn ldexp(f32, i32) -> f32 */
     /* fn ldexp<N : num>(vec<N, f32>, vec<N, i32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[191],
+    /* overloads */ &kOverloads[179],
   },
   {
     /* [40] */
     /* fn length(f32) -> f32 */
     /* fn length<N : num>(vec<N, f32>) -> f32 */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[193],
+    /* overloads */ &kOverloads[181],
   },
   {
     /* [41] */
     /* fn log(f32) -> f32 */
     /* fn log<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[195],
+    /* overloads */ &kOverloads[183],
   },
   {
     /* [42] */
     /* fn log2(f32) -> f32 */
     /* fn log2<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[197],
+    /* overloads */ &kOverloads[185],
   },
   {
     /* [43] */
     /* 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[199],
+    /* overloads */ &kOverloads[187],
   },
   {
     /* [44] */
     /* 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[201],
+    /* overloads */ &kOverloads[189],
   },
   {
     /* [45] */
@@ -8595,83 +8250,83 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* 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[133],
+    /* overloads */ &kOverloads[121],
   },
   {
     /* [46] */
     /* fn modf(f32) -> _modf_result */
     /* fn modf<N : num>(vec<N, f32>) -> _modf_result_vec<N> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[205],
+    /* overloads */ &kOverloads[193],
   },
   {
     /* [47] */
     /* fn normalize<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[256],
+    /* overloads */ &kOverloads[244],
   },
   {
     /* [48] */
     /* fn pack2x16float(vec2<f32>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[255],
+    /* overloads */ &kOverloads[243],
   },
   {
     /* [49] */
     /* fn pack2x16snorm(vec2<f32>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[241],
+    /* overloads */ &kOverloads[229],
   },
   {
     /* [50] */
     /* fn pack2x16unorm(vec2<f32>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[254],
+    /* overloads */ &kOverloads[242],
   },
   {
     /* [51] */
     /* fn pack4x8snorm(vec4<f32>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[253],
+    /* overloads */ &kOverloads[241],
   },
   {
     /* [52] */
     /* fn pack4x8unorm(vec4<f32>) -> u32 */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[246],
+    /* overloads */ &kOverloads[234],
   },
   {
     /* [53] */
     /* fn pow(f32, f32) -> f32 */
     /* fn pow<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[219],
+    /* overloads */ &kOverloads[207],
   },
   {
     /* [54] */
     /* fn reflect<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[244],
+    /* overloads */ &kOverloads[232],
   },
   {
     /* [55] */
     /* fn refract<N : num>(vec<N, f32>, vec<N, f32>, f32) -> vec<N, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[243],
+    /* overloads */ &kOverloads[231],
   },
   {
     /* [56] */
     /* fn reverseBits<T : iu32>(T) -> T */
     /* fn reverseBits<N : num, T : iu32>(vec<N, T>) -> vec<N, T> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[225],
+    /* overloads */ &kOverloads[213],
   },
   {
     /* [57] */
     /* fn round(f32) -> f32 */
     /* fn round<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[227],
+    /* overloads */ &kOverloads[215],
   },
   {
     /* [58] */
@@ -8679,118 +8334,118 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* 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[136],
+    /* overloads */ &kOverloads[124],
   },
   {
     /* [59] */
     /* fn sign(f32) -> f32 */
     /* fn sign<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[231],
+    /* overloads */ &kOverloads[219],
   },
   {
     /* [60] */
     /* fn sin(f32) -> f32 */
     /* fn sin<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[233],
+    /* overloads */ &kOverloads[221],
   },
   {
     /* [61] */
     /* fn sinh(f32) -> f32 */
     /* fn sinh<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[211],
+    /* overloads */ &kOverloads[199],
   },
   {
     /* [62] */
     /* 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[209],
+    /* overloads */ &kOverloads[197],
   },
   {
     /* [63] */
     /* fn sqrt(f32) -> f32 */
     /* fn sqrt<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[141],
+    /* overloads */ &kOverloads[129],
   },
   {
     /* [64] */
     /* fn step(f32, f32) -> f32 */
     /* fn step<N : num>(vec<N, f32>, vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[235],
+    /* overloads */ &kOverloads[223],
   },
   {
     /* [65] */
     /* fn storageBarrier() */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[242],
+    /* overloads */ &kOverloads[230],
   },
   {
     /* [66] */
     /* fn tan(f32) -> f32 */
     /* fn tan<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[237],
+    /* overloads */ &kOverloads[225],
   },
   {
     /* [67] */
     /* fn tanh(f32) -> f32 */
     /* fn tanh<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[221],
+    /* overloads */ &kOverloads[209],
   },
   {
     /* [68] */
     /* fn transpose<M : num, N : num>(mat<M, N, f32>) -> mat<N, M, f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[245],
+    /* overloads */ &kOverloads[233],
   },
   {
     /* [69] */
     /* fn trunc(f32) -> f32 */
     /* fn trunc<N : num>(vec<N, f32>) -> vec<N, f32> */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[217],
+    /* overloads */ &kOverloads[205],
   },
   {
     /* [70] */
     /* fn unpack2x16float(u32) -> vec2<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[247],
+    /* overloads */ &kOverloads[235],
   },
   {
     /* [71] */
     /* fn unpack2x16snorm(u32) -> vec2<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[248],
+    /* overloads */ &kOverloads[236],
   },
   {
     /* [72] */
     /* fn unpack2x16unorm(u32) -> vec2<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[249],
+    /* overloads */ &kOverloads[237],
   },
   {
     /* [73] */
     /* fn unpack4x8snorm(u32) -> vec4<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[250],
+    /* overloads */ &kOverloads[238],
   },
   {
     /* [74] */
     /* fn unpack4x8unorm(u32) -> vec4<f32> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[251],
+    /* overloads */ &kOverloads[239],
   },
   {
     /* [75] */
     /* fn workgroupBarrier() */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[252],
+    /* overloads */ &kOverloads[240],
   },
   {
     /* [76] */
@@ -8816,10 +8471,10 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn textureDimensions(texture: texture_depth_cube_array) -> vec2<i32> */
     /* fn textureDimensions(texture: texture_depth_cube_array, level: i32) -> vec2<i32> */
     /* fn textureDimensions(texture: texture_depth_multisampled_2d) -> vec2<i32> */
-    /* fn textureDimensions<F : texel_format, A : read_or_write>(texture: texture_storage_1d<F, A>) -> i32 */
-    /* fn textureDimensions<F : texel_format, A : read_or_write>(texture: texture_storage_2d<F, A>) -> vec2<i32> */
-    /* fn textureDimensions<F : texel_format, A : read_or_write>(texture: texture_storage_2d_array<F, A>) -> vec2<i32> */
-    /* fn textureDimensions<F : texel_format, A : read_or_write>(texture: texture_storage_3d<F, A>) -> vec3<i32> */
+    /* fn textureDimensions<F : texel_format, A : write_only>(texture: texture_storage_1d<F, A>) -> i32 */
+    /* fn textureDimensions<F : texel_format, A : write_only>(texture: texture_storage_2d<F, A>) -> vec2<i32> */
+    /* fn textureDimensions<F : texel_format, A : write_only>(texture: texture_storage_2d_array<F, A>) -> vec2<i32> */
+    /* fn textureDimensions<F : texel_format, A : write_only>(texture: texture_storage_3d<F, A>) -> vec3<i32> */
     /* fn textureDimensions(texture: texture_external) -> vec2<i32> */
     /* num overloads */ 27,
     /* overloads */ &kOverloads[0],
@@ -8830,9 +8485,9 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn textureNumLayers<T : fiu32>(texture: texture_cube_array<T>) -> i32 */
     /* fn textureNumLayers(texture: texture_depth_2d_array) -> i32 */
     /* fn textureNumLayers(texture: texture_depth_cube_array) -> i32 */
-    /* fn textureNumLayers<F : texel_format, A : read_or_write>(texture: texture_storage_2d_array<F, A>) -> i32 */
+    /* fn textureNumLayers<F : texel_format, A : write_only>(texture: texture_storage_2d_array<F, A>) -> i32 */
     /* num overloads */ 5,
-    /* overloads */ &kOverloads[128],
+    /* overloads */ &kOverloads[116],
   },
   {
     /* [78] */
@@ -8847,14 +8502,14 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn textureNumLevels(texture: texture_depth_cube) -> i32 */
     /* fn textureNumLevels(texture: texture_depth_cube_array) -> i32 */
     /* num overloads */ 10,
-    /* overloads */ &kOverloads[90],
+    /* overloads */ &kOverloads[69],
   },
   {
     /* [79] */
     /* fn textureNumSamples<T : fiu32>(texture: texture_multisampled_2d<T>) -> i32 */
     /* fn textureNumSamples(texture: texture_depth_multisampled_2d) -> i32 */
     /* num overloads */ 2,
-    /* overloads */ &kOverloads[207],
+    /* overloads */ &kOverloads[195],
   },
   {
     /* [80] */
@@ -8874,7 +8529,7 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn textureSample(texture: texture_depth_cube, sampler: sampler, coords: vec3<f32>) -> f32 */
     /* fn textureSample(texture: texture_depth_cube_array, sampler: sampler, coords: vec3<f32>, array_index: i32) -> f32 */
     /* num overloads */ 15,
-    /* overloads */ &kOverloads[63],
+    /* overloads */ &kOverloads[42],
   },
   {
     /* [81] */
@@ -8887,7 +8542,7 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* 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[100],
+    /* overloads */ &kOverloads[88],
   },
   {
     /* [82] */
@@ -8898,7 +8553,7 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* 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[122],
+    /* overloads */ &kOverloads[110],
   },
   {
     /* [83] */
@@ -8909,7 +8564,7 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* 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[116],
+    /* overloads */ &kOverloads[104],
   },
   {
     /* [84] */
@@ -8922,7 +8577,7 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* 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[108],
+    /* overloads */ &kOverloads[96],
   },
   {
     /* [85] */
@@ -8942,7 +8597,7 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn textureSampleLevel(texture: texture_depth_cube_array, sampler: sampler, coords: vec3<f32>, array_index: i32, level: i32) -> f32 */
     /* fn textureSampleLevel(texture: texture_external, sampler: sampler, coords: vec2<f32>) -> vec4<f32> */
     /* num overloads */ 15,
-    /* overloads */ &kOverloads[48],
+    /* overloads */ &kOverloads[27],
   },
   {
     /* [86] */
@@ -8959,7 +8614,7 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn textureStore(texture: texture_storage_2d_array<u32_texel_format, write>, coords: vec2<i32>, array_index: i32, value: vec4<u32>) */
     /* fn textureStore(texture: texture_storage_3d<u32_texel_format, write>, coords: vec3<i32>, value: vec4<u32>) */
     /* num overloads */ 12,
-    /* overloads */ &kOverloads[78],
+    /* overloads */ &kOverloads[57],
   },
   {
     /* [87] */
@@ -8971,87 +8626,75 @@ constexpr IntrinsicInfo kIntrinsics[] = {
     /* fn textureLoad(texture: texture_depth_2d, coords: vec2<i32>, level: i32) -> f32 */
     /* fn textureLoad(texture: texture_depth_2d_array, coords: vec2<i32>, array_index: i32, level: i32) -> f32 */
     /* fn textureLoad(texture: texture_depth_multisampled_2d, coords: vec2<i32>, sample_index: i32) -> f32 */
-    /* fn textureLoad(texture: texture_storage_1d<f32_texel_format, read>, coords: i32) -> vec4<f32> */
-    /* fn textureLoad(texture: texture_storage_2d<f32_texel_format, read>, coords: vec2<i32>) -> vec4<f32> */
-    /* fn textureLoad(texture: texture_storage_2d_array<f32_texel_format, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32> */
-    /* fn textureLoad(texture: texture_storage_3d<f32_texel_format, read>, coords: vec3<i32>) -> vec4<f32> */
-    /* fn textureLoad(texture: texture_storage_1d<i32_texel_format, read>, coords: i32) -> vec4<i32> */
-    /* fn textureLoad(texture: texture_storage_2d<i32_texel_format, read>, coords: vec2<i32>) -> vec4<i32> */
-    /* fn textureLoad(texture: texture_storage_2d_array<i32_texel_format, read>, coords: vec2<i32>, array_index: i32) -> vec4<i32> */
-    /* fn textureLoad(texture: texture_storage_3d<i32_texel_format, read>, coords: vec3<i32>) -> vec4<i32> */
-    /* fn textureLoad(texture: texture_storage_1d<u32_texel_format, read>, coords: i32) -> vec4<u32> */
-    /* fn textureLoad(texture: texture_storage_2d<u32_texel_format, read>, coords: vec2<i32>) -> vec4<u32> */
-    /* fn textureLoad(texture: texture_storage_2d_array<u32_texel_format, read>, coords: vec2<i32>, array_index: i32) -> vec4<u32> */
-    /* fn textureLoad(texture: texture_storage_3d<u32_texel_format, read>, coords: vec3<i32>) -> vec4<u32> */
     /* fn textureLoad(texture: texture_external, coords: vec2<i32>) -> vec4<f32> */
-    /* num overloads */ 21,
-    /* overloads */ &kOverloads[27],
+    /* num overloads */ 9,
+    /* overloads */ &kOverloads[79],
   },
   {
     /* [88] */
     /* fn atomicLoad<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[265],
+    /* overloads */ &kOverloads[253],
   },
   {
     /* [89] */
     /* fn atomicStore<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[266],
+    /* overloads */ &kOverloads[254],
   },
   {
     /* [90] */
     /* fn atomicAdd<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[267],
+    /* overloads */ &kOverloads[255],
   },
   {
     /* [91] */
     /* fn atomicSub<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[268],
+    /* overloads */ &kOverloads[256],
   },
   {
     /* [92] */
     /* fn atomicMax<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[269],
+    /* overloads */ &kOverloads[257],
   },
   {
     /* [93] */
     /* fn atomicMin<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[270],
+    /* overloads */ &kOverloads[258],
   },
   {
     /* [94] */
     /* fn atomicAnd<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[271],
+    /* overloads */ &kOverloads[259],
   },
   {
     /* [95] */
     /* fn atomicOr<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[272],
+    /* overloads */ &kOverloads[260],
   },
   {
     /* [96] */
     /* fn atomicXor<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[273],
+    /* overloads */ &kOverloads[261],
   },
   {
     /* [97] */
     /* fn atomicExchange<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T) -> T */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[274],
+    /* overloads */ &kOverloads[262],
   },
   {
     /* [98] */
     /* fn atomicCompareExchangeWeak<T : iu32, S : workgroup_or_storage>(ptr<S, atomic<T>, read_write>, T, T) -> vec2<T> */
     /* num overloads */ 1,
-    /* overloads */ &kOverloads[275],
+    /* overloads */ &kOverloads[263],
   },
 };
 
diff --git a/src/intrinsic_table_test.cc b/src/intrinsic_table_test.cc
index 2fda174657..855f95b015 100644
--- a/src/intrinsic_table_test.cc
+++ b/src/intrinsic_table_test.cc
@@ -389,30 +389,6 @@ TEST_F(IntrinsicTableTest, MatchExternalTexture) {
   EXPECT_EQ(result->Parameters()[1]->Usage(), ParameterUsage::kCoords);
 }
 
-TEST_F(IntrinsicTableTest, MatchROStorageTexture) {
-  auto* f32 = create<sem::F32>();
-  auto* i32 = create<sem::I32>();
-  auto* vec2_i32 = create<sem::Vector>(i32, 2);
-  auto* vec4_f32 = create<sem::Vector>(f32, 4);
-  auto* subtype =
-      sem::StorageTexture::SubtypeFor(ast::ImageFormat::kR32Float, Types());
-  auto* tex = create<sem::StorageTexture>(ast::TextureDimension::k2d,
-                                          ast::ImageFormat::kR32Float,
-                                          ast::Access::kRead, subtype);
-
-  auto* result =
-      table->Lookup(IntrinsicType::kTextureLoad, {tex, vec2_i32}, Source{});
-  ASSERT_NE(result, nullptr) << Diagnostics().str();
-  ASSERT_EQ(Diagnostics().str(), "");
-  EXPECT_THAT(result->Type(), IntrinsicType::kTextureLoad);
-  EXPECT_THAT(result->ReturnType(), vec4_f32);
-  ASSERT_EQ(result->Parameters().size(), 2u);
-  EXPECT_EQ(result->Parameters()[0]->Type(), tex);
-  EXPECT_EQ(result->Parameters()[0]->Usage(), ParameterUsage::kTexture);
-  EXPECT_EQ(result->Parameters()[1]->Type(), vec2_i32);
-  EXPECT_EQ(result->Parameters()[1]->Usage(), ParameterUsage::kCoords);
-}
-
 TEST_F(IntrinsicTableTest, MatchWOStorageTexture) {
   auto* f32 = create<sem::F32>();
   auto* i32 = create<sem::I32>();
@@ -566,10 +542,10 @@ TEST_F(IntrinsicTableTest, OverloadOrderByNumberOfParameters) {
   textureDimensions(texture: texture_depth_cube) -> vec2<i32>
   textureDimensions(texture: texture_depth_cube_array) -> vec2<i32>
   textureDimensions(texture: texture_depth_multisampled_2d) -> vec2<i32>
-  textureDimensions(texture: texture_storage_1d<F, A>) -> i32  where: A is read or write
-  textureDimensions(texture: texture_storage_2d<F, A>) -> vec2<i32>  where: A is read or write
-  textureDimensions(texture: texture_storage_2d_array<F, A>) -> vec2<i32>  where: A is read or write
-  textureDimensions(texture: texture_storage_3d<F, A>) -> vec3<i32>  where: A is read or write
+  textureDimensions(texture: texture_storage_1d<F, A>) -> i32  where: A is write
+  textureDimensions(texture: texture_storage_2d<F, A>) -> vec2<i32>  where: A is write
+  textureDimensions(texture: texture_storage_2d_array<F, A>) -> vec2<i32>  where: A is write
+  textureDimensions(texture: texture_storage_3d<F, A>) -> vec3<i32>  where: A is write
   textureDimensions(texture: texture_external) -> vec2<i32>
 )");
 }
@@ -605,10 +581,10 @@ TEST_F(IntrinsicTableTest, OverloadOrderByMatchingParameter) {
   textureDimensions(texture: texture_depth_cube) -> vec2<i32>
   textureDimensions(texture: texture_depth_cube_array) -> vec2<i32>
   textureDimensions(texture: texture_depth_multisampled_2d) -> vec2<i32>
-  textureDimensions(texture: texture_storage_1d<F, A>) -> i32  where: A is read or write
-  textureDimensions(texture: texture_storage_2d<F, A>) -> vec2<i32>  where: A is read or write
-  textureDimensions(texture: texture_storage_2d_array<F, A>) -> vec2<i32>  where: A is read or write
-  textureDimensions(texture: texture_storage_3d<F, A>) -> vec3<i32>  where: A is read or write
+  textureDimensions(texture: texture_storage_1d<F, A>) -> i32  where: A is write
+  textureDimensions(texture: texture_storage_2d<F, A>) -> vec2<i32>  where: A is write
+  textureDimensions(texture: texture_storage_2d_array<F, A>) -> vec2<i32>  where: A is write
+  textureDimensions(texture: texture_storage_3d<F, A>) -> vec3<i32>  where: A is write
   textureDimensions(texture: texture_external) -> vec2<i32>
 )");
 }
diff --git a/src/intrinsics.def b/src/intrinsics.def
index dca62bd158..4b7c84a3e4 100644
--- a/src/intrinsics.def
+++ b/src/intrinsics.def
@@ -128,7 +128,7 @@ match i32_texel_format:
 match u32_texel_format:
   rgba8uint | rgba16uint | r32uint | rg32uint | rgba32uint
 
-match read_or_write: read | write
+match write_only: write
 
 match function_private_workgroup: function | private | workgroup
 match workgroup_or_storage: workgroup | storage
@@ -416,16 +416,16 @@ fn textureDimensions(texture: texture_depth_cube, level: i32) -> vec2<i32>
 fn textureDimensions(texture: texture_depth_cube_array) -> vec2<i32>
 fn textureDimensions(texture: texture_depth_cube_array, level: i32) -> vec2<i32>
 fn textureDimensions(texture: texture_depth_multisampled_2d) -> vec2<i32>
-fn textureDimensions<F: texel_format, A: read_or_write>(texture: texture_storage_1d<F, A>) -> i32
-fn textureDimensions<F: texel_format, A: read_or_write>(texture: texture_storage_2d<F, A>) -> vec2<i32>
-fn textureDimensions<F: texel_format, A: read_or_write>(texture: texture_storage_2d_array<F, A>) -> vec2<i32>
-fn textureDimensions<F: texel_format, A: read_or_write>(texture: texture_storage_3d<F, A>) -> vec3<i32>
+fn textureDimensions<F: texel_format, A: write_only>(texture: texture_storage_1d<F, A>) -> i32
+fn textureDimensions<F: texel_format, A: write_only>(texture: texture_storage_2d<F, A>) -> vec2<i32>
+fn textureDimensions<F: texel_format, A: write_only>(texture: texture_storage_2d_array<F, A>) -> vec2<i32>
+fn textureDimensions<F: texel_format, A: write_only>(texture: texture_storage_3d<F, A>) -> vec3<i32>
 fn textureDimensions(texture: texture_external) -> vec2<i32>
 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
 fn textureNumLayers(texture: texture_depth_cube_array) -> i32
-fn textureNumLayers<F: texel_format, A: read_or_write>(texture: texture_storage_2d_array<F, A>) -> i32
+fn textureNumLayers<F: texel_format, A: write_only>(texture: texture_storage_2d_array<F, A>) -> i32
 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
@@ -516,18 +516,6 @@ fn textureLoad<T: fiu32>(texture: texture_multisampled_2d<T>, coords: vec2<i32>,
 fn textureLoad(texture: texture_depth_2d, coords: vec2<i32>, level: i32) -> f32
 fn textureLoad(texture: texture_depth_2d_array, coords: vec2<i32>, array_index: i32, level: i32) -> f32
 fn textureLoad(texture: texture_depth_multisampled_2d, coords: vec2<i32>, sample_index: i32) -> f32
-[[deprecated]] fn textureLoad(texture: texture_storage_1d<f32_texel_format, read>, coords: i32) -> vec4<f32>
-[[deprecated]] fn textureLoad(texture: texture_storage_2d<f32_texel_format, read>, coords: vec2<i32>) -> vec4<f32>
-[[deprecated]] fn textureLoad(texture: texture_storage_2d_array<f32_texel_format, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32>
-[[deprecated]] fn textureLoad(texture: texture_storage_3d<f32_texel_format, read>, coords: vec3<i32>) -> vec4<f32>
-[[deprecated]] fn textureLoad(texture: texture_storage_1d<i32_texel_format, read>, coords: i32) -> vec4<i32>
-[[deprecated]] fn textureLoad(texture: texture_storage_2d<i32_texel_format, read>, coords: vec2<i32>) -> vec4<i32>
-[[deprecated]] fn textureLoad(texture: texture_storage_2d_array<i32_texel_format, read>, coords: vec2<i32>, array_index: i32) -> vec4<i32>
-[[deprecated]] fn textureLoad(texture: texture_storage_3d<i32_texel_format, read>, coords: vec3<i32>) -> vec4<i32>
-[[deprecated]] fn textureLoad(texture: texture_storage_1d<u32_texel_format, read>, coords: i32) -> vec4<u32>
-[[deprecated]] fn textureLoad(texture: texture_storage_2d<u32_texel_format, read>, coords: vec2<i32>) -> vec4<u32>
-[[deprecated]] fn textureLoad(texture: texture_storage_2d_array<u32_texel_format, read>, coords: vec2<i32>, array_index: i32) -> vec4<u32>
-[[deprecated]] fn textureLoad(texture: texture_storage_3d<u32_texel_format, read>, coords: vec3<i32>) -> vec4<u32>
 fn textureLoad(texture: texture_external, coords: vec2<i32>) -> vec4<f32>
 
 [[stage("fragment", "compute")]] fn atomicLoad<T: iu32, S: workgroup_or_storage>(ptr<S, atomic<T>, read_write>) -> T
diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc
index 39a06efc25..25b2f3b39e 100644
--- a/src/reader/spirv/function.cc
+++ b/src/reader/spirv/function.cc
@@ -5288,12 +5288,8 @@ bool FunctionEmitter::EmitImageAccess(const spvtools::opt::Instruction& inst) {
     case SpvOpImageDrefGather:
       return Fail() << " image gather is not yet supported";
     case SpvOpImageFetch:
-      // Read a single texel from a sampled image.
-      builtin_name = "textureLoad";
-      use_level_of_detail_suffix = false;
-      break;
     case SpvOpImageRead:
-      // Read a single texel from a storage image.
+      // Read a single texel from a sampled or storage image.
       builtin_name = "textureLoad";
       use_level_of_detail_suffix = false;
       break;
@@ -5365,11 +5361,11 @@ bool FunctionEmitter::EmitImageAccess(const spvtools::opt::Instruction& inst) {
 
     image_operands_mask ^= SpvImageOperandsLodMask;
     arg_index++;
-  } else if ((opcode == SpvOpImageFetch) &&
-             (texture_type->Is<SampledTexture>() ||
-              texture_type->Is<DepthTexture>())) {
-    // textureLoad on sampled texture and depth texture requires an explicit
-    // level-of-detail parameter.
+  } else if ((opcode == SpvOpImageFetch || opcode == SpvOpImageRead) &&
+             !texture_type
+                  ->IsAnyOf<DepthMultisampledTexture, MultisampledTexture>()) {
+    // textureLoad requires an explicit level-of-detail parameter for
+    // non-multisampled texture types.
     params.push_back(parser_impl_.MakeNullValue(ty_.I32()));
   }
   if (arg_index + 1 < num_args &&
diff --git a/src/reader/spirv/parser_impl.cc b/src/reader/spirv/parser_impl.cc
index 8ebaefc72c..8f102e107f 100644
--- a/src/reader/spirv/parser_impl.cc
+++ b/src/reader/spirv/parser_impl.cc
@@ -2537,7 +2537,7 @@ const Pointer* ParserImpl::GetTypeForHandleVar(
 
     // WGSL textures are always formatted.  Unformatted textures are always
     // sampled.
-    if (usage.IsSampledTexture() ||
+    if (usage.IsSampledTexture() || usage.IsStorageReadTexture() ||
         (image_type->format() == SpvImageFormatUnknown)) {
       // Make a sampled texture type.
       auto* ast_sampled_component_type =
@@ -2566,8 +2566,7 @@ const Pointer* ParserImpl::GetTypeForHandleVar(
         ast_store_type = ty_.SampledTexture(dim, ast_sampled_component_type);
       }
     } else {
-      const auto access = usage.IsStorageReadTexture() ? ast::Access::kRead
-                                                       : ast::Access::kWrite;
+      const auto access = ast::Access::kWrite;
       const auto format = enum_converter_.ToImageFormat(image_type->format());
       if (format == ast::ImageFormat::kNone) {
         return nullptr;
diff --git a/src/reader/spirv/parser_impl_convert_type_test.cc b/src/reader/spirv/parser_impl_convert_type_test.cc
index 056ff3933f..d7ab594ac2 100644
--- a/src/reader/spirv/parser_impl_convert_type_test.cc
+++ b/src/reader/spirv/parser_impl_convert_type_test.cc
@@ -695,7 +695,7 @@ TEST_F(SpvParserTest, ConvertType_Array_NoDeduplication) {
 
 TEST_F(SpvParserTest, ConvertType_RuntimeArray_NoDeduplication) {
   // Prove that distinct SPIR-V runtime arrays map to distinct WGSL types.
-  // The implementation already deduplciates them because it knows
+  // The implementation already de-duplicates them because it knows
   // runtime-arrays normally have stride decorations.
   auto assembly = Preamble() + R"(
     %uint = OpTypeInt 32 0
diff --git a/src/reader/spirv/parser_impl_handle_test.cc b/src/reader/spirv/parser_impl_handle_test.cc
index 212ccc3218..89fdf69ee9 100644
--- a/src/reader/spirv/parser_impl_handle_test.cc
+++ b/src/reader/spirv/parser_impl_handle_test.cc
@@ -1309,7 +1309,7 @@ INSTANTIATE_TEST_SUITE_P(Images,
     x_10
     none
     undefined
-    __storage_texture_1d_rg32float_read
+    __sampled_texture_1d__f32
   })"},
                              DeclUnderspecifiedHandleCase{R"(
          OpDecorate %10 NonReadable
@@ -4615,7 +4615,7 @@ INSTANTIATE_TEST_SUITE_P(ImageRead_OptionalParams,
     x_20
     none
     undefined
-    __storage_texture_2d_rgba32float_read
+    __sampled_texture_2d__f32
   })",
                               R"(VariableDeclStatement{
       VariableConst{
@@ -4629,6 +4629,7 @@ INSTANTIATE_TEST_SUITE_P(ImageRead_OptionalParams,
             (
               Identifier[not set]{x_20}
               Identifier[not set]{vi12}
+              ScalarConstructor[not set]{0}
             )
           }
         }
@@ -5079,7 +5080,7 @@ INSTANTIATE_TEST_SUITE_P(
     x_20
     none
     undefined
-    __storage_texture_2d_rgba32float_read
+    __sampled_texture_2d__f32
   })",
          R"(VariableDeclStatement{
       VariableConst{
@@ -5093,6 +5094,7 @@ INSTANTIATE_TEST_SUITE_P(
             (
               Identifier[not set]{x_20}
               Identifier[not set]{vi12}
+              ScalarConstructor[not set]{0}
             )
           }
         }
@@ -5108,7 +5110,7 @@ INSTANTIATE_TEST_SUITE_P(
     x_20
     none
     undefined
-    __storage_texture_2d_rgba32uint_read
+    __sampled_texture_2d__u32
   })",
          R"(VariableDeclStatement{
       VariableConst{
@@ -5122,6 +5124,7 @@ INSTANTIATE_TEST_SUITE_P(
             (
               Identifier[not set]{x_20}
               Identifier[not set]{vi12}
+              ScalarConstructor[not set]{0}
             )
           }
         }
@@ -5143,7 +5146,7 @@ INSTANTIATE_TEST_SUITE_P(
     x_20
     none
     undefined
-    __storage_texture_2d_rgba32sint_read
+    __sampled_texture_2d__i32
   })",
          R"(VariableDeclStatement{
       VariableConst{
@@ -5157,6 +5160,7 @@ INSTANTIATE_TEST_SUITE_P(
             (
               Identifier[not set]{x_20}
               Identifier[not set]{vi12}
+              ScalarConstructor[not set]{0}
             )
           }
         }
@@ -5237,7 +5241,7 @@ INSTANTIATE_TEST_SUITE_P(
     x_20
     none
     undefined
-    __storage_texture_1d_rgba32float_read
+    __sampled_texture_1d__f32
   })",
          R"(VariableDeclStatement{
       VariableConst{
@@ -5271,7 +5275,7 @@ INSTANTIATE_TEST_SUITE_P(
     x_20
     none
     undefined
-    __storage_texture_2d_rgba32float_read
+    __sampled_texture_2d__f32
   })",
          R"(VariableDeclStatement{
       VariableConst{
@@ -5305,7 +5309,7 @@ INSTANTIATE_TEST_SUITE_P(
     x_20
     none
     undefined
-    __storage_texture_3d_rgba32float_read
+    __sampled_texture_3d__f32
   })",
          R"(VariableDeclStatement{
       VariableConst{
@@ -5380,7 +5384,7 @@ INSTANTIATE_TEST_SUITE_P(
     x_20
     none
     undefined
-    __storage_texture_2d_array_rgba32float_read
+    __sampled_texture_2d_array__f32
   })",
          R"(VariableDeclStatement{
       VariableConst{
diff --git a/src/resolver/assignment_validation_test.cc b/src/resolver/assignment_validation_test.cc
index 0063a2ad50..c0ed563e7e 100644
--- a/src/resolver/assignment_validation_test.cc
+++ b/src/resolver/assignment_validation_test.cc
@@ -221,14 +221,14 @@ TEST_F(ResolverAssignmentValidationTest, AssignToConstant_Fail) {
 }
 
 TEST_F(ResolverAssignmentValidationTest, AssignNonConstructible_Handle) {
-  // var a : texture_storage_1d<rgba8unorm, read>;
-  // var b : texture_storage_1d<rgba8unorm, read>;
+  // var a : texture_storage_1d<rgba8unorm, write>;
+  // var b : texture_storage_1d<rgba8unorm, write>;
   // a = b;
 
   auto make_type = [&] {
     return ty.storage_texture(ast::TextureDimension::k1d,
                               ast::ImageFormat::kRgba8Unorm,
-                              ast::Access::kRead);
+                              ast::Access::kWrite);
   };
 
   Global("a", make_type(), ast::StorageClass::kNone,
diff --git a/src/resolver/intrinsic_test.cc b/src/resolver/intrinsic_test.cc
index 7e38a9ae8b..6358f01902 100644
--- a/src/resolver/intrinsic_test.cc
+++ b/src/resolver/intrinsic_test.cc
@@ -268,71 +268,6 @@ class ResolverIntrinsicTest_TextureOperation
   }
 };
 
-using ResolverIntrinsicTest_StorageTextureOperation =
-    ResolverIntrinsicTest_TextureOperation;
-TEST_P(ResolverIntrinsicTest_StorageTextureOperation, TextureLoadRo) {
-  auto dim = GetParam().dim;
-  auto type = GetParam().type;
-  auto format = GetParam().format;
-
-  auto* coords_type = GetCoordsType(dim, ty.i32());
-  auto* texture_type = ty.storage_texture(dim, format, ast::Access::kRead);
-
-  ast::ExpressionList call_params;
-
-  add_call_param("texture", texture_type, &call_params);
-  add_call_param("coords", coords_type, &call_params);
-
-  if (ast::IsTextureArray(dim)) {
-    add_call_param("array_index", ty.i32(), &call_params);
-  }
-
-  auto* expr = Call("textureLoad", call_params);
-  WrapInFunction(expr);
-
-  EXPECT_TRUE(r()->Resolve()) << r()->error();
-
-  ASSERT_NE(TypeOf(expr), nullptr);
-  ASSERT_TRUE(TypeOf(expr)->Is<sem::Vector>());
-  if (type == Texture::kF32) {
-    EXPECT_TRUE(TypeOf(expr)->As<sem::Vector>()->type()->Is<sem::F32>());
-  } else if (type == Texture::kI32) {
-    EXPECT_TRUE(TypeOf(expr)->As<sem::Vector>()->type()->Is<sem::I32>());
-  } else {
-    EXPECT_TRUE(TypeOf(expr)->As<sem::Vector>()->type()->Is<sem::U32>());
-  }
-  EXPECT_EQ(TypeOf(expr)->As<sem::Vector>()->Width(), 4u);
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    ResolverTest,
-    ResolverIntrinsicTest_StorageTextureOperation,
-    testing::Values(
-        TextureTestParams{ast::TextureDimension::k1d, Texture::kF32,
-                          ast::ImageFormat::kR32Float},
-        TextureTestParams{ast::TextureDimension::k1d, Texture::kI32,
-                          ast::ImageFormat::kR32Sint},
-        TextureTestParams{ast::TextureDimension::k1d, Texture::kF32,
-                          ast::ImageFormat::kRgba8Unorm},
-        TextureTestParams{ast::TextureDimension::k2d, Texture::kF32,
-                          ast::ImageFormat::kR32Float},
-        TextureTestParams{ast::TextureDimension::k2d, Texture::kI32,
-                          ast::ImageFormat::kR32Sint},
-        TextureTestParams{ast::TextureDimension::k2d, Texture::kF32,
-                          ast::ImageFormat::kRgba8Unorm},
-        TextureTestParams{ast::TextureDimension::k2dArray, Texture::kF32,
-                          ast::ImageFormat::kR32Float},
-        TextureTestParams{ast::TextureDimension::k2dArray, Texture::kI32,
-                          ast::ImageFormat::kR32Sint},
-        TextureTestParams{ast::TextureDimension::k2dArray, Texture::kF32,
-                          ast::ImageFormat::kRgba8Unorm},
-        TextureTestParams{ast::TextureDimension::k3d, Texture::kF32,
-                          ast::ImageFormat::kR32Float},
-        TextureTestParams{ast::TextureDimension::k3d, Texture::kI32,
-                          ast::ImageFormat::kR32Sint},
-        TextureTestParams{ast::TextureDimension::k3d, Texture::kF32,
-                          ast::ImageFormat::kRgba8Unorm}));
-
 using ResolverIntrinsicTest_SampledTextureOperation =
     ResolverIntrinsicTest_TextureOperation;
 TEST_P(ResolverIntrinsicTest_SampledTextureOperation, TextureLoadSampled) {
@@ -1806,10 +1741,6 @@ const char* expected_texture_overload(
     case ValidTextureOverload::kDimensionsDepthCube:
     case ValidTextureOverload::kDimensionsDepthCubeArray:
     case ValidTextureOverload::kDimensionsDepthMultisampled2d:
-    case ValidTextureOverload::kDimensionsStorageRO1d:
-    case ValidTextureOverload::kDimensionsStorageRO2d:
-    case ValidTextureOverload::kDimensionsStorageRO2dArray:
-    case ValidTextureOverload::kDimensionsStorageRO3d:
     case ValidTextureOverload::kDimensionsStorageWO1d:
     case ValidTextureOverload::kDimensionsStorageWO2d:
     case ValidTextureOverload::kDimensionsStorageWO2dArray:
@@ -1981,28 +1912,6 @@ const char* expected_texture_overload(
       return R"(textureLoad(texture, coords, sample_index))";
     case ValidTextureOverload::kLoadDepth2dArrayLevelF32:
       return R"(textureLoad(texture, coords, array_index, level))";
-    case ValidTextureOverload::kLoadStorageRO1dRgba32float:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8unorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8snorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16float:
-    case ValidTextureOverload::kLoadStorageRO2dR32uint:
-    case ValidTextureOverload::kLoadStorageRO2dR32sint:
-    case ValidTextureOverload::kLoadStorageRO2dR32float:
-    case ValidTextureOverload::kLoadStorageRO2dRg32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32float:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32float:
-      return R"(textureLoad(texture, coords))";
-    case ValidTextureOverload::kLoadStorageRO2dArrayRgba32float:
-      return R"(textureLoad(texture, coords, array_index))";
-    case ValidTextureOverload::kLoadStorageRO3dRgba32float:
-      return R"(textureLoad(texture, coords))";
     case ValidTextureOverload::kStoreWO1dRgba32float:
     case ValidTextureOverload::kStoreWO2dRgba32float:
     case ValidTextureOverload::kStoreWO3dRgba32float:
diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc
index 9782ae3431..a9ab1653d3 100644
--- a/src/resolver/resolver.cc
+++ b/src/resolver/resolver.cc
@@ -424,17 +424,15 @@ bool Resolver::ValidateAtomic(const ast::Atomic* a, const sem::Atomic* s) {
 
 bool Resolver::ValidateStorageTexture(const ast::StorageTexture* t) {
   switch (t->access()) {
-    case ast::Access::kUndefined:
-      AddError("storage textures must have access control", t->source());
-      return false;
-    case ast::Access::kReadWrite:
-      AddError("storage textures only support read-only and write-only access",
-               t->source());
-      return false;
-
-    case ast::Access::kRead:
     case ast::Access::kWrite:
       break;
+    case ast::Access::kUndefined:
+      AddError("storage texture missing access control", t->source());
+      return false;
+    default:
+      AddError("storage textures currently only support 'write' access control",
+               t->source());
+      return false;
   }
 
   if (!IsValidStorageTextureDimension(t->dim())) {
diff --git a/src/resolver/type_validation_test.cc b/src/resolver/type_validation_test.cc
index 354978f772..6c71d67a08 100644
--- a/src/resolver/type_validation_test.cc
+++ b/src/resolver/type_validation_test.cc
@@ -698,10 +698,7 @@ TEST_P(MultisampledTextureDimensionTest, All) {
   auto& params = GetParam();
   Global(Source{{12, 34}}, "a", ty.multisampled_texture(params.dim, ty.i32()),
          ast::StorageClass::kNone, nullptr,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
   if (params.is_valid) {
     EXPECT_TRUE(r()->Resolve()) << r()->error();
@@ -750,10 +747,7 @@ TEST_P(MultisampledTextureTypeTest, All) {
          ty.multisampled_texture(ast::TextureDimension::k2d,
                                  params.type_func(*this)),
          ast::StorageClass::kNone, nullptr,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
   if (params.is_valid) {
     EXPECT_TRUE(r()->Resolve()) << r()->error();
@@ -787,17 +781,15 @@ static constexpr DimensionParams Dimension_cases[] = {
 using StorageTextureDimensionTest = ResolverTestWithParam<DimensionParams>;
 TEST_P(StorageTextureDimensionTest, All) {
   // [[group(0), binding(0)]]
-  // var a : texture_storage_*<ru32int, read>;
+  // var a : texture_storage_*<ru32int, write>;
   auto& params = GetParam();
 
-  auto* st = ty.storage_texture(Source{{12, 34}}, params.dim,
-                                ast::ImageFormat::kR32Uint, ast::Access::kRead);
+  auto* st =
+      ty.storage_texture(Source{{12, 34}}, params.dim,
+                         ast::ImageFormat::kR32Uint, ast::Access::kWrite);
 
   Global("a", st, ast::StorageClass::kNone,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
   if (params.is_valid) {
     EXPECT_TRUE(r()->Resolve()) << r()->error();
@@ -858,45 +850,33 @@ using StorageTextureFormatTest = ResolverTestWithParam<FormatParams>;
 TEST_P(StorageTextureFormatTest, All) {
   auto& params = GetParam();
   // [[group(0), binding(0)]]
-  // var a : texture_storage_1d<*, read>;
+  // var a : texture_storage_1d<*, write>;
   // [[group(0), binding(1)]]
-  // var b : texture_storage_2d<*, read>;
+  // var b : texture_storage_2d<*, write>;
   // [[group(0), binding(2)]]
-  // var c : texture_storage_2d_array<*, read>;
+  // var c : texture_storage_2d_array<*, write>;
   // [[group(0), binding(3)]]
-  // var d : texture_storage_3d<*, read>;
+  // var d : texture_storage_3d<*, write>;
 
   auto* st_a = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d,
-                                  params.format, ast::Access::kRead);
+                                  params.format, ast::Access::kWrite);
   Global("a", st_a, ast::StorageClass::kNone,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
   auto* st_b = ty.storage_texture(ast::TextureDimension::k2d, params.format,
-                                  ast::Access::kRead);
+                                  ast::Access::kWrite);
   Global("b", st_b, ast::StorageClass::kNone,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(1),
-         });
+         ast::DecorationList{GroupAndBinding(0, 1)});
 
   auto* st_c = ty.storage_texture(ast::TextureDimension::k2dArray,
-                                  params.format, ast::Access::kRead);
+                                  params.format, ast::Access::kWrite);
   Global("c", st_c, ast::StorageClass::kNone,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(2),
-         });
+         ast::DecorationList{GroupAndBinding(0, 2)});
 
   auto* st_d = ty.storage_texture(ast::TextureDimension::k3d, params.format,
-                                  ast::Access::kRead);
+                                  ast::Access::kWrite);
   Global("d", st_d, ast::StorageClass::kNone,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(3),
-         });
+         ast::DecorationList{GroupAndBinding(0, 3)});
 
   if (params.is_valid) {
     EXPECT_TRUE(r()->Resolve()) << r()->error();
@@ -923,14 +903,11 @@ TEST_F(StorageTextureAccessTest, MissingAccess_Fail) {
                          ast::ImageFormat::kR32Uint, ast::Access::kUndefined);
 
   Global("a", st, ast::StorageClass::kNone,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
   EXPECT_FALSE(r()->Resolve());
   EXPECT_EQ(r()->error(),
-            "12:34 error: storage textures must have access control");
+            "12:34 error: storage texture missing access control");
 }
 
 TEST_F(StorageTextureAccessTest, RWAccess_Fail) {
@@ -942,31 +919,28 @@ TEST_F(StorageTextureAccessTest, RWAccess_Fail) {
                          ast::ImageFormat::kR32Uint, ast::Access::kReadWrite);
 
   Global("a", st, ast::StorageClass::kNone, nullptr,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
   EXPECT_FALSE(r()->Resolve());
   EXPECT_EQ(r()->error(),
-            "12:34 error: storage textures only support read-only and "
-            "write-only access");
+            "12:34 error: storage textures currently only support 'write' "
+            "access control");
 }
 
-TEST_F(StorageTextureAccessTest, ReadOnlyAccess_Pass) {
+TEST_F(StorageTextureAccessTest, ReadOnlyAccess_Fail) {
   // [[group(0), binding(0)]]
   // var a : texture_storage_1d<ru32int, read>;
 
-  auto* st = ty.storage_texture(ast::TextureDimension::k1d,
+  auto* st = ty.storage_texture(Source{{12, 34}}, ast::TextureDimension::k1d,
                                 ast::ImageFormat::kR32Uint, ast::Access::kRead);
 
   Global("a", st, ast::StorageClass::kNone, nullptr,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
-  EXPECT_TRUE(r()->Resolve()) << r()->error();
+  EXPECT_FALSE(r()->Resolve());
+  EXPECT_EQ(r()->error(),
+            "12:34 error: storage textures currently only support 'write' "
+            "access control");
 }
 
 TEST_F(StorageTextureAccessTest, WriteOnlyAccess_Pass) {
@@ -978,10 +952,7 @@ TEST_F(StorageTextureAccessTest, WriteOnlyAccess_Pass) {
                          ast::Access::kWrite);
 
   Global("a", st, ast::StorageClass::kNone, nullptr,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(0),
-             create<ast::GroupDecoration>(0),
-         });
+         ast::DecorationList{GroupAndBinding(0, 0)});
 
   EXPECT_TRUE(r()->Resolve()) << r()->error();
 }
diff --git a/src/transform/robustness_test.cc b/src/transform/robustness_test.cc
index 3f9078746a..a6612bee68 100644
--- a/src/transform/robustness_test.cc
+++ b/src/transform/robustness_test.cc
@@ -663,10 +663,6 @@ TEST_F(RobustnessTest, TextureLoad_Clamp) {
 [[group(0), binding(0)]] var tex_ms_2d : texture_multisampled_2d<f32>;
 [[group(0), binding(0)]] var tex_depth_2d : texture_depth_2d;
 [[group(0), binding(0)]] var tex_depth_2d_arr : texture_depth_2d_array;
-[[group(0), binding(0)]] var tex_storage_1d : texture_storage_1d<rgba8sint, read>;
-[[group(0), binding(0)]] var tex_storage_2d : texture_storage_2d<rgba8sint, read>;
-[[group(0), binding(0)]] var tex_storage_2d_arr : texture_storage_2d_array<rgba8sint, read>;
-[[group(0), binding(0)]] var tex_storage_3d : texture_storage_3d<rgba8sint, read>;
 [[group(0), binding(0)]] var tex_external : texture_external;
 
 fn f() {
@@ -681,15 +677,12 @@ fn f() {
   ignore(textureLoad(tex_ms_2d, vec2<i32>(1, 2), sample_idx));
   ignore(textureLoad(tex_depth_2d, vec2<i32>(1, 2), level_idx));
   ignore(textureLoad(tex_depth_2d_arr, vec2<i32>(1, 2), array_idx, level_idx));
-  ignore(textureLoad(tex_storage_1d, 1));
-  ignore(textureLoad(tex_storage_2d, vec2<i32>(1, 2)));
-  ignore(textureLoad(tex_storage_2d_arr, vec2<i32>(1, 2), array_idx));
-  ignore(textureLoad(tex_storage_3d, vec3<i32>(1, 2, 3)));
   ignore(textureLoad(tex_external, vec2<i32>(1, 2)));
 }
 )";
 
-  auto* expect = R"(
+  auto* expect =
+      R"(
 [[group(0), binding(0)]] var tex_1d : texture_1d<f32>;
 
 [[group(0), binding(0)]] var tex_2d : texture_2d<f32>;
@@ -704,14 +697,6 @@ fn f() {
 
 [[group(0), binding(0)]] var tex_depth_2d_arr : texture_depth_2d_array;
 
-[[group(0), binding(0)]] var tex_storage_1d : texture_storage_1d<rgba8sint, read>;
-
-[[group(0), binding(0)]] var tex_storage_2d : texture_storage_2d<rgba8sint, read>;
-
-[[group(0), binding(0)]] var tex_storage_2d_arr : texture_storage_2d_array<rgba8sint, read>;
-
-[[group(0), binding(0)]] var tex_storage_3d : texture_storage_3d<rgba8sint, read>;
-
 [[group(0), binding(0)]] var tex_external : texture_external;
 
 fn f() {
@@ -725,10 +710,6 @@ fn f() {
   ignore(textureLoad(tex_ms_2d, clamp(vec2<i32>(1, 2), vec2<i32>(), (textureDimensions(tex_ms_2d) - vec2<i32>(1))), sample_idx));
   ignore(textureLoad(tex_depth_2d, clamp(vec2<i32>(1, 2), vec2<i32>(), (textureDimensions(tex_depth_2d, clamp(level_idx, 0, (textureNumLevels(tex_depth_2d) - 1))) - vec2<i32>(1))), clamp(level_idx, 0, (textureNumLevels(tex_depth_2d) - 1))));
   ignore(textureLoad(tex_depth_2d_arr, clamp(vec2<i32>(1, 2), vec2<i32>(), (textureDimensions(tex_depth_2d_arr, clamp(level_idx, 0, (textureNumLevels(tex_depth_2d_arr) - 1))) - vec2<i32>(1))), clamp(array_idx, 0, (textureNumLayers(tex_depth_2d_arr) - 1)), clamp(level_idx, 0, (textureNumLevels(tex_depth_2d_arr) - 1))));
-  ignore(textureLoad(tex_storage_1d, clamp(1, i32(), (textureDimensions(tex_storage_1d) - i32(1)))));
-  ignore(textureLoad(tex_storage_2d, clamp(vec2<i32>(1, 2), vec2<i32>(), (textureDimensions(tex_storage_2d) - vec2<i32>(1)))));
-  ignore(textureLoad(tex_storage_2d_arr, clamp(vec2<i32>(1, 2), vec2<i32>(), (textureDimensions(tex_storage_2d_arr) - vec2<i32>(1))), clamp(array_idx, 0, (textureNumLayers(tex_storage_2d_arr) - 1))));
-  ignore(textureLoad(tex_storage_3d, clamp(vec3<i32>(1, 2, 3), vec3<i32>(), (textureDimensions(tex_storage_3d) - vec3<i32>(1)))));
   ignore(textureLoad(tex_external, clamp(vec2<i32>(1, 2), vec2<i32>(), (textureDimensions(tex_external) - vec2<i32>(1)))));
 }
 )";
diff --git a/src/writer/glsl/generator_impl_intrinsic_texture_test.cc b/src/writer/glsl/generator_impl_intrinsic_texture_test.cc
index 850b448558..16075d83ac 100644
--- a/src/writer/glsl/generator_impl_intrinsic_texture_test.cc
+++ b/src/writer/glsl/generator_impl_intrinsic_texture_test.cc
@@ -37,20 +37,16 @@ ExpectedResult expected_texture_overload(
   using ValidTextureOverload = ast::intrinsic::test::ValidTextureOverload;
   switch (overload) {
     case ValidTextureOverload::kDimensions1d:
-    case ValidTextureOverload::kDimensionsStorageRO1d:
     case ValidTextureOverload::kDimensionsStorageWO1d:
     case ValidTextureOverload::kDimensions2d:
     case ValidTextureOverload::kDimensionsDepth2d:
-    case ValidTextureOverload::kDimensionsStorageRO2d:
     case ValidTextureOverload::kDimensionsStorageWO2d:
     case ValidTextureOverload::kDimensionsDepthMultisampled2d:
     case ValidTextureOverload::kDimensionsMultisampled2d:
     case ValidTextureOverload::kDimensions2dArray:
     case ValidTextureOverload::kDimensionsDepth2dArray:
-    case ValidTextureOverload::kDimensionsStorageRO2dArray:
     case ValidTextureOverload::kDimensionsStorageWO2dArray:
     case ValidTextureOverload::kDimensions3d:
-    case ValidTextureOverload::kDimensionsStorageRO3d:
     case ValidTextureOverload::kDimensionsStorageWO3d:
     case ValidTextureOverload::kDimensionsCube:
     case ValidTextureOverload::kDimensionsDepthCube:
@@ -222,28 +218,6 @@ ExpectedResult expected_texture_overload(
       return R"(texture.Load(ivec3(1, 2, 3)).x;)";
     case ValidTextureOverload::kLoadDepth2dArrayLevelF32:
       return R"(texture.Load(ivec4(1, 2, 3, 4)).x;)";
-    case ValidTextureOverload::kLoadStorageRO1dRgba32float:
-      return R"(texture.Load(ivec2(1, 0));)";
-    case ValidTextureOverload::kLoadStorageRO2dRgba8unorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8snorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16float:
-    case ValidTextureOverload::kLoadStorageRO2dR32uint:
-    case ValidTextureOverload::kLoadStorageRO2dR32sint:
-    case ValidTextureOverload::kLoadStorageRO2dR32float:
-    case ValidTextureOverload::kLoadStorageRO2dRg32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32float:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32float:
-      return R"(texture.Load(ivec3(1, 2, 0));)";
-    case ValidTextureOverload::kLoadStorageRO2dArrayRgba32float:
-    case ValidTextureOverload::kLoadStorageRO3dRgba32float:
-      return R"(texture.Load(ivec4(1, 2, 3, 0));)";
     case ValidTextureOverload::kStoreWO1dRgba32float:
       return R"(texture[1] = vec4(2.0f, 3.0f, 4.0f, 5.0f);)";
     case ValidTextureOverload::kStoreWO2dRgba32float:
diff --git a/src/writer/glsl/generator_impl_type_test.cc b/src/writer/glsl/generator_impl_type_test.cc
index c5cde9f89c..0709dae3d6 100644
--- a/src/writer/glsl/generator_impl_type_test.cc
+++ b/src/writer/glsl/generator_impl_type_test.cc
@@ -535,21 +535,17 @@ TEST_F(GlslGeneratorImplTest_Type, EmitMultisampledTexture) {
 struct GlslStorageTextureData {
   ast::TextureDimension dim;
   ast::ImageFormat imgfmt;
-  bool ro;
   std::string result;
 };
 inline std::ostream& operator<<(std::ostream& out,
                                 GlslStorageTextureData data) {
-  out << data.dim << (data.ro ? "ReadOnly" : "WriteOnly");
-  return out;
+  return out << data.dim;
 }
 using GlslStorageTexturesTest = TestParamHelper<GlslStorageTextureData>;
 TEST_P(GlslStorageTexturesTest, Emit) {
   auto params = GetParam();
 
-  auto* t =
-      ty.storage_texture(params.dim, params.imgfmt,
-                         params.ro ? ast::Access::kRead : ast::Access::kWrite);
+  auto* t = ty.storage_texture(params.dim, params.imgfmt, ast::Access::kWrite);
 
   Global("tex", t,
          ast::DecorationList{
@@ -569,44 +565,44 @@ INSTANTIATE_TEST_SUITE_P(
     GlslGeneratorImplTest_Type,
     GlslStorageTexturesTest,
     testing::Values(
-        GlslStorageTextureData{ast::TextureDimension::k1d,
-                               ast::ImageFormat::kRgba8Unorm, true,
-                               "Texture1D<float4> tex : register(t1, space2);"},
-        GlslStorageTextureData{ast::TextureDimension::k2d,
-                               ast::ImageFormat::kRgba16Float, true,
-                               "Texture2D<float4> tex : register(t1, space2);"},
         GlslStorageTextureData{
-            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Float, true,
-            "Texture2DArray<float4> tex : register(t1, space2);"},
-        GlslStorageTextureData{ast::TextureDimension::k3d,
-                               ast::ImageFormat::kRg32Float, true,
-                               "Texture3D<float4> tex : register(t1, space2);"},
-        GlslStorageTextureData{
-            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Float, false,
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba8Unorm,
             "RWTexture1D<float4> tex : register(u1, space2);"},
         GlslStorageTextureData{
-            ast::TextureDimension::k2d, ast::ImageFormat::kRgba16Uint, false,
+            ast::TextureDimension::k2d, ast::ImageFormat::kRgba16Float,
+            "RWTexture2D<float4> tex : register(u1, space2);"},
+        GlslStorageTextureData{
+            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Float,
+            "RWTexture2DArray<float4> tex : register(u1, space2);"},
+        GlslStorageTextureData{
+            ast::TextureDimension::k3d, ast::ImageFormat::kRg32Float,
+            "RWTexture3D<float4> tex : register(u1, space2);"},
+        GlslStorageTextureData{
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Float,
+            "RWTexture1D<float4> tex : register(u1, space2);"},
+        GlslStorageTextureData{
+            ast::TextureDimension::k2d, ast::ImageFormat::kRgba16Uint,
             "RWTexture2D<uint4> tex : register(u1, space2);"},
         GlslStorageTextureData{
-            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Uint, false,
+            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Uint,
             "RWTexture2DArray<uint4> tex : register(u1, space2);"},
         GlslStorageTextureData{
-            ast::TextureDimension::k3d, ast::ImageFormat::kRg32Uint, false,
+            ast::TextureDimension::k3d, ast::ImageFormat::kRg32Uint,
             "RWTexture3D<uint4> tex : register(u1, space2);"},
-        GlslStorageTextureData{ast::TextureDimension::k1d,
-                               ast::ImageFormat::kRgba32Uint, true,
-                               "Texture1D<uint4> tex : register(t1, space2);"},
+        GlslStorageTextureData{
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Uint,
+            "RWTexture1D<uint4> tex : register(u1, space2);"},
         GlslStorageTextureData{ast::TextureDimension::k2d,
-                               ast::ImageFormat::kRgba16Sint, true,
-                               "Texture2D<int4> tex : register(t1, space2);"},
+                               ast::ImageFormat::kRgba16Sint,
+                               "RWTexture2D<int4> tex : register(u1, space2);"},
         GlslStorageTextureData{
-            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Sint, true,
-            "Texture2DArray<int4> tex : register(t1, space2);"},
+            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Sint,
+            "RWTexture2DArray<int4> tex : register(u1, space2);"},
         GlslStorageTextureData{ast::TextureDimension::k3d,
-                               ast::ImageFormat::kRg32Sint, true,
-                               "Texture3D<int4> tex : register(t1, space2);"},
+                               ast::ImageFormat::kRg32Sint,
+                               "RWTexture3D<int4> tex : register(u1, space2);"},
         GlslStorageTextureData{
-            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Sint, false,
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Sint,
             "RWTexture1D<int4> tex : register(u1, space2);"}));
 
 }  // namespace
diff --git a/src/writer/hlsl/generator_impl.cc b/src/writer/hlsl/generator_impl.cc
index 1008c857cf..73011664ec 100644
--- a/src/writer/hlsl/generator_impl.cc
+++ b/src/writer/hlsl/generator_impl.cc
@@ -2436,10 +2436,8 @@ bool GeneratorImpl::EmitHandleVariable(const sem::Variable* var) {
 
   if (unwrapped_type->Is<sem::Texture>()) {
     register_space = "t";
-    if (auto* storage_tex = unwrapped_type->As<sem::StorageTexture>()) {
-      if (storage_tex->access() != ast::Access::kRead) {
-        register_space = "u";
-      }
+    if (unwrapped_type->Is<sem::StorageTexture>()) {
+      register_space = "u";
     }
   } else if (unwrapped_type->Is<sem::Sampler>()) {
     register_space = "s";
diff --git a/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc b/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc
index 279209ea1f..b19864dc64 100644
--- a/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc
+++ b/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc
@@ -38,7 +38,6 @@ ExpectedResult expected_texture_overload(
   using ValidTextureOverload = ast::intrinsic::test::ValidTextureOverload;
   switch (overload) {
     case ValidTextureOverload::kDimensions1d:
-    case ValidTextureOverload::kDimensionsStorageRO1d:
     case ValidTextureOverload::kDimensionsStorageWO1d:
       return {
           R"(int tint_tmp;
@@ -48,7 +47,6 @@ ExpectedResult expected_texture_overload(
       };
     case ValidTextureOverload::kDimensions2d:
     case ValidTextureOverload::kDimensionsDepth2d:
-    case ValidTextureOverload::kDimensionsStorageRO2d:
     case ValidTextureOverload::kDimensionsStorageWO2d:
       return {
           R"(int2 tint_tmp;
@@ -67,7 +65,6 @@ ExpectedResult expected_texture_overload(
 
     case ValidTextureOverload::kDimensions2dArray:
     case ValidTextureOverload::kDimensionsDepth2dArray:
-    case ValidTextureOverload::kDimensionsStorageRO2dArray:
     case ValidTextureOverload::kDimensionsStorageWO2dArray:
       return {
           R"(int3 tint_tmp;
@@ -76,7 +73,6 @@ ExpectedResult expected_texture_overload(
           "tint_tmp.xy;",
       };
     case ValidTextureOverload::kDimensions3d:
-    case ValidTextureOverload::kDimensionsStorageRO3d:
     case ValidTextureOverload::kDimensionsStorageWO3d:
       return {
           R"(int3 tint_tmp;
@@ -317,28 +313,6 @@ ExpectedResult expected_texture_overload(
       return R"(tint_symbol.Load(int3(1, 2, 3)).x;)";
     case ValidTextureOverload::kLoadDepth2dArrayLevelF32:
       return R"(tint_symbol.Load(int4(1, 2, 3, 4)).x;)";
-    case ValidTextureOverload::kLoadStorageRO1dRgba32float:
-      return R"(tint_symbol.Load(int2(1, 0));)";
-    case ValidTextureOverload::kLoadStorageRO2dRgba8unorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8snorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16float:
-    case ValidTextureOverload::kLoadStorageRO2dR32uint:
-    case ValidTextureOverload::kLoadStorageRO2dR32sint:
-    case ValidTextureOverload::kLoadStorageRO2dR32float:
-    case ValidTextureOverload::kLoadStorageRO2dRg32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32float:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32float:
-      return R"(tint_symbol.Load(int3(1, 2, 0));)";
-    case ValidTextureOverload::kLoadStorageRO2dArrayRgba32float:
-    case ValidTextureOverload::kLoadStorageRO3dRgba32float:
-      return R"(tint_symbol.Load(int4(1, 2, 3, 0));)";
     case ValidTextureOverload::kStoreWO1dRgba32float:
       return R"(tint_symbol[1] = float4(2.0f, 3.0f, 4.0f, 5.0f);)";
     case ValidTextureOverload::kStoreWO2dRgba32float:
diff --git a/src/writer/hlsl/generator_impl_type_test.cc b/src/writer/hlsl/generator_impl_type_test.cc
index a5846e2a69..fe4965ba3a 100644
--- a/src/writer/hlsl/generator_impl_type_test.cc
+++ b/src/writer/hlsl/generator_impl_type_test.cc
@@ -533,27 +533,20 @@ TEST_F(HlslGeneratorImplTest_Type, EmitMultisampledTexture) {
 struct HlslStorageTextureData {
   ast::TextureDimension dim;
   ast::ImageFormat imgfmt;
-  bool ro;
   std::string result;
 };
 inline std::ostream& operator<<(std::ostream& out,
                                 HlslStorageTextureData data) {
-  out << data.dim << (data.ro ? "ReadOnly" : "WriteOnly");
+  out << data.dim;
   return out;
 }
 using HlslStorageTexturesTest = TestParamHelper<HlslStorageTextureData>;
 TEST_P(HlslStorageTexturesTest, Emit) {
   auto params = GetParam();
 
-  auto* t =
-      ty.storage_texture(params.dim, params.imgfmt,
-                         params.ro ? ast::Access::kRead : ast::Access::kWrite);
+  auto* t = ty.storage_texture(params.dim, params.imgfmt, ast::Access::kWrite);
 
-  Global("tex", t,
-         ast::DecorationList{
-             create<ast::BindingDecoration>(1),
-             create<ast::GroupDecoration>(2),
-         });
+  Global("tex", t, ast::DecorationList{GroupAndBinding(2, 1)});
 
   Func("main", {}, ty.void_(), {Ignore(Call("textureDimensions", "tex"))},
        {Stage(ast::PipelineStage::kFragment)});
@@ -567,44 +560,44 @@ INSTANTIATE_TEST_SUITE_P(
     HlslGeneratorImplTest_Type,
     HlslStorageTexturesTest,
     testing::Values(
-        HlslStorageTextureData{ast::TextureDimension::k1d,
-                               ast::ImageFormat::kRgba8Unorm, true,
-                               "Texture1D<float4> tex : register(t1, space2);"},
-        HlslStorageTextureData{ast::TextureDimension::k2d,
-                               ast::ImageFormat::kRgba16Float, true,
-                               "Texture2D<float4> tex : register(t1, space2);"},
         HlslStorageTextureData{
-            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Float, true,
-            "Texture2DArray<float4> tex : register(t1, space2);"},
-        HlslStorageTextureData{ast::TextureDimension::k3d,
-                               ast::ImageFormat::kRg32Float, true,
-                               "Texture3D<float4> tex : register(t1, space2);"},
-        HlslStorageTextureData{
-            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Float, false,
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba8Unorm,
             "RWTexture1D<float4> tex : register(u1, space2);"},
         HlslStorageTextureData{
-            ast::TextureDimension::k2d, ast::ImageFormat::kRgba16Uint, false,
+            ast::TextureDimension::k2d, ast::ImageFormat::kRgba16Float,
+            "RWTexture2D<float4> tex : register(u1, space2);"},
+        HlslStorageTextureData{
+            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Float,
+            "RWTexture2DArray<float4> tex : register(u1, space2);"},
+        HlslStorageTextureData{
+            ast::TextureDimension::k3d, ast::ImageFormat::kRg32Float,
+            "RWTexture3D<float4> tex : register(u1, space2);"},
+        HlslStorageTextureData{
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Float,
+            "RWTexture1D<float4> tex : register(u1, space2);"},
+        HlslStorageTextureData{
+            ast::TextureDimension::k2d, ast::ImageFormat::kRgba16Uint,
             "RWTexture2D<uint4> tex : register(u1, space2);"},
         HlslStorageTextureData{
-            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Uint, false,
+            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Uint,
             "RWTexture2DArray<uint4> tex : register(u1, space2);"},
         HlslStorageTextureData{
-            ast::TextureDimension::k3d, ast::ImageFormat::kRg32Uint, false,
+            ast::TextureDimension::k3d, ast::ImageFormat::kRg32Uint,
             "RWTexture3D<uint4> tex : register(u1, space2);"},
-        HlslStorageTextureData{ast::TextureDimension::k1d,
-                               ast::ImageFormat::kRgba32Uint, true,
-                               "Texture1D<uint4> tex : register(t1, space2);"},
+        HlslStorageTextureData{
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Uint,
+            "RWTexture1D<uint4> tex : register(u1, space2);"},
         HlslStorageTextureData{ast::TextureDimension::k2d,
-                               ast::ImageFormat::kRgba16Sint, true,
-                               "Texture2D<int4> tex : register(t1, space2);"},
+                               ast::ImageFormat::kRgba16Sint,
+                               "RWTexture2D<int4> tex : register(u1, space2);"},
         HlslStorageTextureData{
-            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Sint, true,
-            "Texture2DArray<int4> tex : register(t1, space2);"},
+            ast::TextureDimension::k2dArray, ast::ImageFormat::kR32Sint,
+            "RWTexture2DArray<int4> tex : register(u1, space2);"},
         HlslStorageTextureData{ast::TextureDimension::k3d,
-                               ast::ImageFormat::kRg32Sint, true,
-                               "Texture3D<int4> tex : register(t1, space2);"},
+                               ast::ImageFormat::kRg32Sint,
+                               "RWTexture3D<int4> tex : register(u1, space2);"},
         HlslStorageTextureData{
-            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Sint, false,
+            ast::TextureDimension::k1d, ast::ImageFormat::kRgba32Sint,
             "RWTexture1D<int4> tex : register(u1, space2);"}));
 
 }  // namespace
diff --git a/src/writer/msl/generator_impl_intrinsic_texture_test.cc b/src/writer/msl/generator_impl_intrinsic_texture_test.cc
index f8ebd4df2c..5101add77b 100644
--- a/src/writer/msl/generator_impl_intrinsic_texture_test.cc
+++ b/src/writer/msl/generator_impl_intrinsic_texture_test.cc
@@ -26,7 +26,6 @@ std::string expected_texture_overload(
   using ValidTextureOverload = ast::intrinsic::test::ValidTextureOverload;
   switch (overload) {
     case ValidTextureOverload::kDimensions1d:
-    case ValidTextureOverload::kDimensionsStorageRO1d:
     case ValidTextureOverload::kDimensionsStorageWO1d:
       return R"(int(texture.get_width()))";
     case ValidTextureOverload::kDimensions2d:
@@ -39,13 +38,10 @@ std::string expected_texture_overload(
     case ValidTextureOverload::kDimensionsDepthCube:
     case ValidTextureOverload::kDimensionsDepthCubeArray:
     case ValidTextureOverload::kDimensionsDepthMultisampled2d:
-    case ValidTextureOverload::kDimensionsStorageRO2d:
-    case ValidTextureOverload::kDimensionsStorageRO2dArray:
     case ValidTextureOverload::kDimensionsStorageWO2d:
     case ValidTextureOverload::kDimensionsStorageWO2dArray:
       return R"(int2(texture.get_width(), texture.get_height()))";
     case ValidTextureOverload::kDimensions3d:
-    case ValidTextureOverload::kDimensionsStorageRO3d:
     case ValidTextureOverload::kDimensionsStorageWO3d:
       return R"(int3(texture.get_width(), texture.get_height(), texture.get_depth()))";
     case ValidTextureOverload::kDimensions2dLevel:
@@ -227,29 +223,6 @@ std::string expected_texture_overload(
       return R"(texture.read(uint2(int2(1, 2)), 3))";
     case ValidTextureOverload::kLoadDepth2dArrayLevelF32:
       return R"(texture.read(uint2(int2(1, 2)), 3, 4))";
-    case ValidTextureOverload::kLoadStorageRO1dRgba32float:
-      return R"(texture.read(uint(1)))";
-    case ValidTextureOverload::kLoadStorageRO2dRgba8unorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8snorm:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba8sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba16float:
-    case ValidTextureOverload::kLoadStorageRO2dR32uint:
-    case ValidTextureOverload::kLoadStorageRO2dR32sint:
-    case ValidTextureOverload::kLoadStorageRO2dR32float:
-    case ValidTextureOverload::kLoadStorageRO2dRg32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRg32float:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32uint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32sint:
-    case ValidTextureOverload::kLoadStorageRO2dRgba32float:
-      return R"(texture.read(uint2(int2(1, 2))))";
-    case ValidTextureOverload::kLoadStorageRO2dArrayRgba32float:
-      return R"(texture.read(uint2(int2(1, 2)), 3))";
-    case ValidTextureOverload::kLoadStorageRO3dRgba32float:
-      return R"(texture.read(uint3(int3(1, 2, 3))))";
     case ValidTextureOverload::kStoreWO1dRgba32float:
       return R"(texture.write(float4(2.0f, 3.0f, 4.0f, 5.0f), uint(1)))";
     case ValidTextureOverload::kStoreWO2dRgba32float:
diff --git a/src/writer/msl/generator_impl_type_test.cc b/src/writer/msl/generator_impl_type_test.cc
index 6c44c3600b..8b2ef591a2 100644
--- a/src/writer/msl/generator_impl_type_test.cc
+++ b/src/writer/msl/generator_impl_type_test.cc
@@ -843,20 +843,17 @@ TEST_F(MslGeneratorImplTest, Emit_TypeMultisampledTexture) {
 
 struct MslStorageTextureData {
   ast::TextureDimension dim;
-  bool ro;
   std::string result;
 };
 inline std::ostream& operator<<(std::ostream& out, MslStorageTextureData data) {
-  out << data.dim << (data.ro ? "ReadOnly" : "WriteOnly");
-  return out;
+  return out << data.dim;
 }
 using MslStorageTexturesTest = TestParamHelper<MslStorageTextureData>;
 TEST_P(MslStorageTexturesTest, Emit) {
   auto params = GetParam();
 
-  auto* s =
-      ty.storage_texture(params.dim, ast::ImageFormat::kR32Float,
-                         params.ro ? ast::Access::kRead : ast::Access::kWrite);
+  auto* s = ty.storage_texture(params.dim, ast::ImageFormat::kR32Float,
+                               ast::Access::kWrite);
   Global("test_var", s,
          ast::DecorationList{
              create<ast::BindingDecoration>(0),
@@ -872,23 +869,15 @@ TEST_P(MslStorageTexturesTest, Emit) {
 INSTANTIATE_TEST_SUITE_P(
     MslGeneratorImplTest,
     MslStorageTexturesTest,
-    testing::Values(
-        MslStorageTextureData{ast::TextureDimension::k1d, true,
-                              "texture1d<float, access::read>"},
-        MslStorageTextureData{ast::TextureDimension::k2d, true,
-                              "texture2d<float, access::read>"},
-        MslStorageTextureData{ast::TextureDimension::k2dArray, true,
-                              "texture2d_array<float, access::read>"},
-        MslStorageTextureData{ast::TextureDimension::k3d, true,
-                              "texture3d<float, access::read>"},
-        MslStorageTextureData{ast::TextureDimension::k1d, false,
-                              "texture1d<float, access::write>"},
-        MslStorageTextureData{ast::TextureDimension::k2d, false,
-                              "texture2d<float, access::write>"},
-        MslStorageTextureData{ast::TextureDimension::k2dArray, false,
-                              "texture2d_array<float, access::write>"},
-        MslStorageTextureData{ast::TextureDimension::k3d, false,
-                              "texture3d<float, access::write>"}));
+    testing::Values(MslStorageTextureData{ast::TextureDimension::k1d,
+                                          "texture1d<float, access::write>"},
+                    MslStorageTextureData{ast::TextureDimension::k2d,
+                                          "texture2d<float, access::write>"},
+                    MslStorageTextureData{
+                        ast::TextureDimension::k2dArray,
+                        "texture2d_array<float, access::write>"},
+                    MslStorageTextureData{ast::TextureDimension::k3d,
+                                          "texture3d<float, access::write>"}));
 
 }  // namespace
 }  // namespace msl
diff --git a/src/writer/spirv/builder_global_variable_test.cc b/src/writer/spirv/builder_global_variable_test.cc
index d3e111e374..f464bee12c 100644
--- a/src/writer/spirv/builder_global_variable_test.cc
+++ b/src/writer/spirv/builder_global_variable_test.cc
@@ -506,34 +506,6 @@ OpName %5 "c"
 )");
 }
 
-TEST_F(BuilderTest, GlobalVar_TextureStorageReadOnly) {
-  // var<uniform_constant> a : texture_storage_2d<r32uint, read>;
-
-  auto* type =
-      ty.storage_texture(ast::TextureDimension::k2d, ast::ImageFormat::kR32Uint,
-                         ast::Access::kRead);
-
-  auto* var_a = Global("a", type,
-                       ast::DecorationList{
-                           create<ast::BindingDecoration>(0),
-                           create<ast::GroupDecoration>(0),
-                       });
-
-  spirv::Builder& b = Build();
-
-  EXPECT_TRUE(b.GenerateGlobalVariable(var_a)) << b.error();
-
-  EXPECT_EQ(DumpInstructions(b.annots()), R"(OpDecorate %1 NonWritable
-OpDecorate %1 Binding 0
-OpDecorate %1 DescriptorSet 0
-)");
-  EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeInt 32 0
-%3 = OpTypeImage %4 2D 0 0 0 2 R32ui
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-)");
-}
-
 TEST_F(BuilderTest, GlobalVar_TextureStorageWriteOnly) {
   // var<uniform_constant> a : texture_storage_2d<r32uint, write>;
 
@@ -564,13 +536,15 @@ OpDecorate %1 DescriptorSet 0
 
 // Check that multiple texture_storage types with different access modifiers
 // only produces a single OpTypeImage.
-TEST_F(BuilderTest, GlobalVar_TextureStorageWithDifferentAccess) {
-  // var<uniform_constant> a : texture_storage_2d<r32uint, read>;
+// Test disabled as storage textures currently only support 'write' access. In
+// the future we'll likely support read_write.
+TEST_F(BuilderTest, DISABLED_GlobalVar_TextureStorageWithDifferentAccess) {
+  // var<uniform_constant> a : texture_storage_2d<r32uint, read_write>;
   // var<uniform_constant> b : texture_storage_2d<r32uint, write>;
 
   auto* type_a =
       ty.storage_texture(ast::TextureDimension::k2d, ast::ImageFormat::kR32Uint,
-                         ast::Access::kRead);
+                         ast::Access::kReadWrite);
   auto* var_a = Global("a", type_a, ast::StorageClass::kNone,
                        ast::DecorationList{
                            create<ast::BindingDecoration>(0),
diff --git a/src/writer/spirv/builder_intrinsic_texture_test.cc b/src/writer/spirv/builder_intrinsic_texture_test.cc
index 78146dc277..bb28957345 100644
--- a/src/writer/spirv/builder_intrinsic_texture_test.cc
+++ b/src/writer/spirv/builder_intrinsic_texture_test.cc
@@ -492,88 +492,6 @@ OpCapability ImageQuery
 )",
           R"(
 OpCapability ImageQuery
-)"};
-    case ValidTextureOverload::kDimensionsStorageRO1d:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 1D 0 0 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeInt 32 1
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageQuerySize %9 %10
-)",
-          R"(
-OpCapability Image1D
-OpCapability ImageQuery
-)"};
-    case ValidTextureOverload::kDimensionsStorageRO2d:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%10 = OpTypeInt 32 1
-%9 = OpTypeVector %10 2
-)",
-          R"(
-%11 = OpLoad %3 %1
-%8 = OpImageQuerySize %9 %11
-)",
-          R"(
-OpCapability ImageQuery
-)"};
-    case ValidTextureOverload::kDimensionsStorageRO2dArray:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 1 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%10 = OpTypeInt 32 1
-%9 = OpTypeVector %10 2
-%12 = OpTypeVector %10 3
-)",
-          R"(
-%13 = OpLoad %3 %1
-%11 = OpImageQuerySize %12 %13
-%8 = OpVectorShuffle %9 %11 %11 0 1
-)",
-          R"(
-OpCapability ImageQuery
-)"};
-    case ValidTextureOverload::kDimensionsStorageRO3d:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 3D 0 0 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%10 = OpTypeInt 32 1
-%9 = OpTypeVector %10 3
-)",
-          R"(
-%11 = OpLoad %3 %1
-%8 = OpImageQuerySize %9 %11
-)",
-          R"(
-OpCapability ImageQuery
 )"};
     case ValidTextureOverload::kDimensionsStorageWO1d:
       return {
@@ -3115,442 +3033,6 @@ OpCapability Sampled1D
 %11 = OpLoad %3 %1
 %9 = OpImageFetch %10 %11 %17 Sample %18
 %8 = OpCompositeExtract %4 %9 0
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO1dRgba32float:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 1D 0 0 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%11 = OpTypeInt 32 1
-%12 = OpConstant %11 1
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %12
-)",
-          R"(
-OpCapability Image1D
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba8unorm:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba8
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba8snorm:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba8Snorm
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba8uint:
-      return {
-          R"(
-%4 = OpTypeInt 32 0
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba8ui
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba8sint:
-      return {
-          R"(
-%4 = OpTypeInt 32 1
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba8i
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%11 = OpTypeVector %4 2
-%12 = OpConstant %4 1
-%13 = OpConstant %4 2
-%14 = OpConstantComposite %11 %12 %13
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %14
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba16uint:
-      return {
-          R"(
-%4 = OpTypeInt 32 0
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba16ui
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba16sint:
-      return {
-          R"(
-%4 = OpTypeInt 32 1
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba16i
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%11 = OpTypeVector %4 2
-%12 = OpConstant %4 1
-%13 = OpConstant %4 2
-%14 = OpConstantComposite %11 %12 %13
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %14
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba16float:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba16f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dR32uint:
-      return {
-          R"(
-%4 = OpTypeInt 32 0
-%3 = OpTypeImage %4 2D 0 0 0 2 R32ui
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dR32sint:
-      return {
-          R"(
-%4 = OpTypeInt 32 1
-%3 = OpTypeImage %4 2D 0 0 0 2 R32i
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%11 = OpTypeVector %4 2
-%12 = OpConstant %4 1
-%13 = OpConstant %4 2
-%14 = OpConstantComposite %11 %12 %13
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %14
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dR32float:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 0 0 2 R32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRg32uint:
-      return {
-          R"(
-%4 = OpTypeInt 32 0
-%3 = OpTypeImage %4 2D 0 0 0 2 Rg32ui
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-OpCapability StorageImageExtendedFormats
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRg32sint:
-      return {
-          R"(
-%4 = OpTypeInt 32 1
-%3 = OpTypeImage %4 2D 0 0 0 2 Rg32i
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%11 = OpTypeVector %4 2
-%12 = OpConstant %4 1
-%13 = OpConstant %4 2
-%14 = OpConstantComposite %11 %12 %13
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %14
-)",
-          R"(
-OpCapability StorageImageExtendedFormats
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRg32float:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 0 0 2 Rg32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-OpCapability StorageImageExtendedFormats
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba32uint:
-      return {
-          R"(
-%4 = OpTypeInt 32 0
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba32ui
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba32sint:
-      return {
-          R"(
-%4 = OpTypeInt 32 1
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba32i
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%11 = OpTypeVector %4 2
-%12 = OpConstant %4 1
-%13 = OpConstant %4 2
-%14 = OpConstantComposite %11 %12 %13
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %14
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dRgba32float:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 0 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 2
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstantComposite %11 %13 %14
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %15
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO2dArrayRgba32float:
-
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 2D 0 1 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 3
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstant %12 3
-%16 = OpConstantComposite %11 %13 %14 %15
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %16
-)",
-          R"(
-)"};
-    case ValidTextureOverload::kLoadStorageRO3dRgba32float:
-      return {
-          R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 3D 0 0 0 2 Rgba32f
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeVector %4 4
-%12 = OpTypeInt 32 1
-%11 = OpTypeVector %12 3
-%13 = OpConstant %12 1
-%14 = OpConstant %12 2
-%15 = OpConstant %12 3
-%16 = OpConstantComposite %11 %13 %14 %15
-)",
-          R"(
-%10 = OpLoad %3 %1
-%8 = OpImageRead %9 %10 %16
 )",
           R"(
 )"};
diff --git a/src/writer/spirv/builder_type_test.cc b/src/writer/spirv/builder_type_test.cc
index 88fb703f08..f7d412ac4f 100644
--- a/src/writer/spirv/builder_type_test.cc
+++ b/src/writer/spirv/builder_type_test.cc
@@ -814,8 +814,9 @@ TEST_F(BuilderTest_Type, SampledTexture_Generate_CubeArray) {
 }
 
 TEST_F(BuilderTest_Type, StorageTexture_Generate_1d) {
-  auto* s = ty.storage_texture(ast::TextureDimension::k1d,
-                               ast::ImageFormat::kR32Float, ast::Access::kRead);
+  auto* s =
+      ty.storage_texture(ast::TextureDimension::k1d,
+                         ast::ImageFormat::kR32Float, ast::Access::kWrite);
 
   Global("test_var", s,
          ast::DecorationList{
@@ -833,8 +834,9 @@ TEST_F(BuilderTest_Type, StorageTexture_Generate_1d) {
 }
 
 TEST_F(BuilderTest_Type, StorageTexture_Generate_2d) {
-  auto* s = ty.storage_texture(ast::TextureDimension::k2d,
-                               ast::ImageFormat::kR32Float, ast::Access::kRead);
+  auto* s =
+      ty.storage_texture(ast::TextureDimension::k2d,
+                         ast::ImageFormat::kR32Float, ast::Access::kWrite);
 
   Global("test_var", s,
          ast::DecorationList{
@@ -852,8 +854,9 @@ TEST_F(BuilderTest_Type, StorageTexture_Generate_2d) {
 }
 
 TEST_F(BuilderTest_Type, StorageTexture_Generate_2dArray) {
-  auto* s = ty.storage_texture(ast::TextureDimension::k2dArray,
-                               ast::ImageFormat::kR32Float, ast::Access::kRead);
+  auto* s =
+      ty.storage_texture(ast::TextureDimension::k2dArray,
+                         ast::ImageFormat::kR32Float, ast::Access::kWrite);
 
   Global("test_var", s,
          ast::DecorationList{
@@ -871,8 +874,9 @@ TEST_F(BuilderTest_Type, StorageTexture_Generate_2dArray) {
 }
 
 TEST_F(BuilderTest_Type, StorageTexture_Generate_3d) {
-  auto* s = ty.storage_texture(ast::TextureDimension::k3d,
-                               ast::ImageFormat::kR32Float, ast::Access::kRead);
+  auto* s =
+      ty.storage_texture(ast::TextureDimension::k3d,
+                         ast::ImageFormat::kR32Float, ast::Access::kWrite);
 
   Global("test_var", s,
          ast::DecorationList{
@@ -891,8 +895,9 @@ TEST_F(BuilderTest_Type, StorageTexture_Generate_3d) {
 
 TEST_F(BuilderTest_Type,
        StorageTexture_Generate_SampledTypeFloat_Format_r32float) {
-  auto* s = ty.storage_texture(ast::TextureDimension::k2d,
-                               ast::ImageFormat::kR32Float, ast::Access::kRead);
+  auto* s =
+      ty.storage_texture(ast::TextureDimension::k2d,
+                         ast::ImageFormat::kR32Float, ast::Access::kWrite);
 
   Global("test_var", s,
          ast::DecorationList{
@@ -912,7 +917,7 @@ TEST_F(BuilderTest_Type,
 TEST_F(BuilderTest_Type,
        StorageTexture_Generate_SampledTypeSint_Format_r32sint) {
   auto* s = ty.storage_texture(ast::TextureDimension::k2d,
-                               ast::ImageFormat::kR32Sint, ast::Access::kRead);
+                               ast::ImageFormat::kR32Sint, ast::Access::kWrite);
 
   Global("test_var", s,
          ast::DecorationList{
@@ -932,7 +937,7 @@ TEST_F(BuilderTest_Type,
 TEST_F(BuilderTest_Type,
        StorageTexture_Generate_SampledTypeUint_Format_r32uint) {
   auto* s = ty.storage_texture(ast::TextureDimension::k2d,
-                               ast::ImageFormat::kR32Uint, ast::Access::kRead);
+                               ast::ImageFormat::kR32Uint, ast::Access::kWrite);
 
   Global("test_var", s,
          ast::DecorationList{
diff --git a/src/writer/wgsl/generator_impl_type_test.cc b/src/writer/wgsl/generator_impl_type_test.cc
index 0b422499e5..0a075ec6f8 100644
--- a/src/writer/wgsl/generator_impl_type_test.cc
+++ b/src/writer/wgsl/generator_impl_type_test.cc
@@ -453,18 +453,6 @@ INSTANTIATE_TEST_SUITE_P(
     WgslGeneratorImplTest,
     WgslGenerator_StorageTextureTest,
     testing::Values(
-        StorageTextureData{ast::ImageFormat::kRgba8Sint,
-                           ast::TextureDimension::k1d, ast::Access::kRead,
-                           "texture_storage_1d<rgba8sint, read>"},
-        StorageTextureData{ast::ImageFormat::kRgba8Sint,
-                           ast::TextureDimension::k2d, ast::Access::kRead,
-                           "texture_storage_2d<rgba8sint, read>"},
-        StorageTextureData{ast::ImageFormat::kRgba8Sint,
-                           ast::TextureDimension::k2dArray, ast::Access::kRead,
-                           "texture_storage_2d_array<rgba8sint, read>"},
-        StorageTextureData{ast::ImageFormat::kRgba8Sint,
-                           ast::TextureDimension::k3d, ast::Access::kRead,
-                           "texture_storage_3d<rgba8sint, read>"},
         StorageTextureData{ast::ImageFormat::kRgba8Sint,
                            ast::TextureDimension::k1d, ast::Access::kWrite,
                            "texture_storage_1d<rgba8sint, write>"},
diff --git a/test/bug/tint/1083.wgsl.expected.hlsl b/test/bug/tint/1083.wgsl.expected.hlsl
index 182701b6fe..e793e0d74d 100644
--- a/test/bug/tint/1083.wgsl.expected.hlsl
+++ b/test/bug/tint/1083.wgsl.expected.hlsl
@@ -1,9 +1,5 @@
-SKIP: FAILED
-
 [numthreads(1, 1, 1)]
 void f() {
-  const int c = (1 / 0);
+  const int c = (1 / 1);
   return;
 }
-O:\src\chrome\src\third_party\dawn\third_party\tint\test\Shader@0x000002477B82F5C0(3,18-22): error X4010: Unsigned integer divide by zero
-
diff --git a/test/bug/tint/413.spvasm.expected.hlsl b/test/bug/tint/413.spvasm.expected.hlsl
index 7c8fbaa2b9..8b5111a2f5 100644
--- a/test/bug/tint/413.spvasm.expected.hlsl
+++ b/test/bug/tint/413.spvasm.expected.hlsl
@@ -1,4 +1,3 @@
-warning: use of deprecated intrinsic
 Texture2D<uint4> Src : register(t0, space0);
 RWTexture2D<uint4> Dst : register(u1, space0);
 
diff --git a/test/bug/tint/413.spvasm.expected.msl b/test/bug/tint/413.spvasm.expected.msl
index 3ce4a1a23c..982307bdfe 100644
--- a/test/bug/tint/413.spvasm.expected.msl
+++ b/test/bug/tint/413.spvasm.expected.msl
@@ -1,10 +1,9 @@
-warning: use of deprecated intrinsic
 #include <metal_stdlib>
 
 using namespace metal;
-void main_1(texture2d<uint, access::read> tint_symbol_1, texture2d<uint, access::write> tint_symbol_2) {
+void main_1(texture2d<uint, access::sample> tint_symbol_1, texture2d<uint, access::write> tint_symbol_2) {
   uint4 srcValue = 0u;
-  uint4 const x_18 = tint_symbol_1.read(uint2(int2(0, 0)));
+  uint4 const x_18 = tint_symbol_1.read(uint2(int2(0, 0)), 0);
   srcValue = x_18;
   uint const x_22 = srcValue.x;
   srcValue.x = (x_22 + as_type<uint>(1));
@@ -13,7 +12,7 @@ void main_1(texture2d<uint, access::read> tint_symbol_1, texture2d<uint, access:
   return;
 }
 
-kernel void tint_symbol(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]], texture2d<uint, access::write> tint_symbol_4 [[texture(1)]]) {
+kernel void tint_symbol(texture2d<uint, access::sample> tint_symbol_3 [[texture(0)]], texture2d<uint, access::write> tint_symbol_4 [[texture(1)]]) {
   main_1(tint_symbol_3, tint_symbol_4);
   return;
 }
diff --git a/test/bug/tint/413.spvasm.expected.spvasm b/test/bug/tint/413.spvasm.expected.spvasm
index 2ea39d1fbb..1bab131c47 100644
--- a/test/bug/tint/413.spvasm.expected.spvasm
+++ b/test/bug/tint/413.spvasm.expected.spvasm
@@ -1,8 +1,7 @@
-warning: use of deprecated intrinsic
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 35
+; Bound: 36
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -13,49 +12,49 @@ warning: use of deprecated intrinsic
                OpName %main_1 "main_1"
                OpName %srcValue "srcValue"
                OpName %main "main"
-               OpDecorate %Src NonWritable
                OpDecorate %Src DescriptorSet 0
                OpDecorate %Src Binding 0
                OpDecorate %Dst NonReadable
                OpDecorate %Dst DescriptorSet 0
                OpDecorate %Dst Binding 1
        %uint = OpTypeInt 32 0
-          %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
+          %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
         %Src = OpVariable %_ptr_UniformConstant_3 UniformConstant
-%_ptr_UniformConstant_3_0 = OpTypePointer UniformConstant %3
-        %Dst = OpVariable %_ptr_UniformConstant_3_0 UniformConstant
+          %7 = OpTypeImage %uint 2D 0 0 0 2 R32ui
+%_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
+        %Dst = OpVariable %_ptr_UniformConstant_7 UniformConstant
        %void = OpTypeVoid
-          %7 = OpTypeFunction %void
+          %8 = OpTypeFunction %void
      %v4uint = OpTypeVector %uint 4
 %_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %14 = OpConstantNull %v4uint
+         %15 = OpConstantNull %v4uint
         %int = OpTypeInt 32 1
       %v2int = OpTypeVector %int 2
       %int_0 = OpConstant %int 0
-         %20 = OpConstantComposite %v2int %int_0 %int_0
+         %21 = OpConstantComposite %v2int %int_0 %int_0
      %uint_0 = OpConstant %uint 0
 %_ptr_Function_uint = OpTypePointer Function %uint
       %int_1 = OpConstant %int 1
-     %main_1 = OpFunction %void None %7
-         %10 = OpLabel
-   %srcValue = OpVariable %_ptr_Function_v4uint Function %14
-         %16 = OpLoad %3 %Src
-         %15 = OpImageRead %v4uint %16 %20
-               OpStore %srcValue %15
-         %23 = OpAccessChain %_ptr_Function_uint %srcValue %uint_0
-         %24 = OpLoad %uint %23
-         %25 = OpAccessChain %_ptr_Function_uint %srcValue %uint_0
-         %26 = OpBitcast %uint %int_1
-         %28 = OpIAdd %uint %24 %26
-               OpStore %25 %28
-         %29 = OpLoad %v4uint %srcValue
-         %31 = OpLoad %3 %Dst
-               OpImageWrite %31 %20 %29
+     %main_1 = OpFunction %void None %8
+         %11 = OpLabel
+   %srcValue = OpVariable %_ptr_Function_v4uint Function %15
+         %17 = OpLoad %3 %Src
+         %16 = OpImageFetch %v4uint %17 %21 Lod %int_0
+               OpStore %srcValue %16
+         %24 = OpAccessChain %_ptr_Function_uint %srcValue %uint_0
+         %25 = OpLoad %uint %24
+         %26 = OpAccessChain %_ptr_Function_uint %srcValue %uint_0
+         %27 = OpBitcast %uint %int_1
+         %29 = OpIAdd %uint %25 %27
+               OpStore %26 %29
+         %30 = OpLoad %v4uint %srcValue
+         %32 = OpLoad %7 %Dst
+               OpImageWrite %32 %21 %30
                OpReturn
                OpFunctionEnd
-       %main = OpFunction %void None %7
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %main_1
+       %main = OpFunction %void None %8
+         %34 = OpLabel
+         %35 = OpFunctionCall %void %main_1
                OpReturn
                OpFunctionEnd
diff --git a/test/bug/tint/413.spvasm.expected.wgsl b/test/bug/tint/413.spvasm.expected.wgsl
index 04ff8a455d..db6ebd4916 100644
--- a/test/bug/tint/413.spvasm.expected.wgsl
+++ b/test/bug/tint/413.spvasm.expected.wgsl
@@ -1,11 +1,10 @@
-warning: use of deprecated intrinsic
-[[group(0), binding(0)]] var Src : texture_storage_2d<r32uint, read>;
+[[group(0), binding(0)]] var Src : texture_2d<u32>;
 
 [[group(0), binding(1)]] var Dst : texture_storage_2d<r32uint, write>;
 
 fn main_1() {
   var srcValue : vec4<u32>;
-  let x_18 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0));
+  let x_18 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0), 0);
   srcValue = x_18;
   let x_21 : ptr<function, u32> = &(srcValue.x);
   let x_22 : u32 = *(x_21);
diff --git a/test/bug/tint/453.wgsl b/test/bug/tint/453.wgsl
index 4021fe7309..a456737513 100644
--- a/test/bug/tint/453.wgsl
+++ b/test/bug/tint/453.wgsl
@@ -1,10 +1,10 @@
-[[group(0), binding(0)]] var Src : texture_storage_2d<r32uint, read>;
+[[group(0), binding(0)]] var Src : texture_2d<u32>;
 [[group(0), binding(1)]] var Dst : texture_storage_2d<r32uint, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
   var srcValue : vec4<u32>;
-  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0));
+  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0), 0);
   srcValue = x_22;
   let x_23 : ptr<function, u32> = &srcValue.x;
   let x_24 : u32 = *x_23;
diff --git a/test/bug/tint/453.wgsl.expected.hlsl b/test/bug/tint/453.wgsl.expected.hlsl
index b916bc128a..3dcf77f4a8 100644
--- a/test/bug/tint/453.wgsl.expected.hlsl
+++ b/test/bug/tint/453.wgsl.expected.hlsl
@@ -1,7 +1,3 @@
-bug/tint/453.wgsl:7:26 warning: use of deprecated intrinsic
-  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0));
-                         ^^^^^^^^^^^
-
 Texture2D<uint4> Src : register(t0, space0);
 RWTexture2D<uint4> Dst : register(u1, space0);
 
diff --git a/test/bug/tint/453.wgsl.expected.msl b/test/bug/tint/453.wgsl.expected.msl
index 8451b7c47a..728fc2fb4c 100644
--- a/test/bug/tint/453.wgsl.expected.msl
+++ b/test/bug/tint/453.wgsl.expected.msl
@@ -1,13 +1,9 @@
-bug/tint/453.wgsl:7:26 warning: use of deprecated intrinsic
-  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0));
-                         ^^^^^^^^^^^
-
 #include <metal_stdlib>
 
 using namespace metal;
-kernel void tint_symbol(texture2d<uint, access::read> tint_symbol_1 [[texture(0)]], texture2d<uint, access::write> tint_symbol_2 [[texture(1)]]) {
+kernel void tint_symbol(texture2d<uint, access::sample> tint_symbol_1 [[texture(0)]], texture2d<uint, access::write> tint_symbol_2 [[texture(1)]]) {
   uint4 srcValue = 0u;
-  uint4 const x_22 = tint_symbol_1.read(uint2(int2(0, 0)));
+  uint4 const x_22 = tint_symbol_1.read(uint2(int2(0, 0)), 0);
   srcValue = x_22;
   uint const x_24 = srcValue.x;
   uint const x_25 = (x_24 + 1u);
diff --git a/test/bug/tint/453.wgsl.expected.spvasm b/test/bug/tint/453.wgsl.expected.spvasm
index 566ee37fa1..826d1d21b2 100644
--- a/test/bug/tint/453.wgsl.expected.spvasm
+++ b/test/bug/tint/453.wgsl.expected.spvasm
@@ -1,11 +1,7 @@
-bug/tint/453.wgsl:7:26 warning: use of deprecated intrinsic
-  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0));
-                         ^^^^^^^^^^^
-
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 31
+; Bound: 32
 ; Schema: 0
                OpCapability Shader
                OpMemoryModel Logical GLSL450
@@ -15,42 +11,42 @@ bug/tint/453.wgsl:7:26 warning: use of deprecated intrinsic
                OpName %Dst "Dst"
                OpName %main "main"
                OpName %srcValue "srcValue"
-               OpDecorate %Src NonWritable
                OpDecorate %Src DescriptorSet 0
                OpDecorate %Src Binding 0
                OpDecorate %Dst NonReadable
                OpDecorate %Dst DescriptorSet 0
                OpDecorate %Dst Binding 1
        %uint = OpTypeInt 32 0
-          %3 = OpTypeImage %uint 2D 0 0 0 2 R32ui
+          %3 = OpTypeImage %uint 2D 0 0 0 1 Unknown
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
         %Src = OpVariable %_ptr_UniformConstant_3 UniformConstant
-%_ptr_UniformConstant_3_0 = OpTypePointer UniformConstant %3
-        %Dst = OpVariable %_ptr_UniformConstant_3_0 UniformConstant
+          %7 = OpTypeImage %uint 2D 0 0 0 2 R32ui
+%_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
+        %Dst = OpVariable %_ptr_UniformConstant_7 UniformConstant
        %void = OpTypeVoid
-          %7 = OpTypeFunction %void
+          %8 = OpTypeFunction %void
      %v4uint = OpTypeVector %uint 4
 %_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %14 = OpConstantNull %v4uint
+         %15 = OpConstantNull %v4uint
         %int = OpTypeInt 32 1
       %v2int = OpTypeVector %int 2
       %int_0 = OpConstant %int 0
-         %20 = OpConstantComposite %v2int %int_0 %int_0
+         %21 = OpConstantComposite %v2int %int_0 %int_0
      %uint_0 = OpConstant %uint 0
 %_ptr_Function_uint = OpTypePointer Function %uint
      %uint_1 = OpConstant %uint 1
-       %main = OpFunction %void None %7
-         %10 = OpLabel
-   %srcValue = OpVariable %_ptr_Function_v4uint Function %14
-         %16 = OpLoad %3 %Src
-         %15 = OpImageRead %v4uint %16 %20
-               OpStore %srcValue %15
-         %23 = OpAccessChain %_ptr_Function_uint %srcValue %uint_0
-         %24 = OpLoad %uint %23
-         %26 = OpIAdd %uint %24 %uint_1
-         %27 = OpLoad %v4uint %srcValue
-         %29 = OpLoad %3 %Dst
-         %30 = OpVectorShuffle %v4uint %27 %27 0 0 0 0
-               OpImageWrite %29 %20 %30
+       %main = OpFunction %void None %8
+         %11 = OpLabel
+   %srcValue = OpVariable %_ptr_Function_v4uint Function %15
+         %17 = OpLoad %3 %Src
+         %16 = OpImageFetch %v4uint %17 %21 Lod %int_0
+               OpStore %srcValue %16
+         %24 = OpAccessChain %_ptr_Function_uint %srcValue %uint_0
+         %25 = OpLoad %uint %24
+         %27 = OpIAdd %uint %25 %uint_1
+         %28 = OpLoad %v4uint %srcValue
+         %30 = OpLoad %7 %Dst
+         %31 = OpVectorShuffle %v4uint %28 %28 0 0 0 0
+               OpImageWrite %30 %21 %31
                OpReturn
                OpFunctionEnd
diff --git a/test/bug/tint/453.wgsl.expected.wgsl b/test/bug/tint/453.wgsl.expected.wgsl
index 0af0b6c1bc..28da4c5e2d 100644
--- a/test/bug/tint/453.wgsl.expected.wgsl
+++ b/test/bug/tint/453.wgsl.expected.wgsl
@@ -1,15 +1,11 @@
-bug/tint/453.wgsl:7:26 warning: use of deprecated intrinsic
-  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0));
-                         ^^^^^^^^^^^
-
-[[group(0), binding(0)]] var Src : texture_storage_2d<r32uint, read>;
+[[group(0), binding(0)]] var Src : texture_2d<u32>;
 
 [[group(0), binding(1)]] var Dst : texture_storage_2d<r32uint, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
   var srcValue : vec4<u32>;
-  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0));
+  let x_22 : vec4<u32> = textureLoad(Src, vec2<i32>(0, 0), 0);
   srcValue = x_22;
   let x_23 : ptr<function, u32> = &(srcValue.x);
   let x_24 : u32 = *(x_23);
diff --git a/test/intrinsics/gen/textureDimensions/08a62e.wgsl b/test/intrinsics/gen/textureDimensions/08a62e.wgsl
deleted file mode 100644
index f95e683ebd..0000000000
--- a/test/intrinsics/gen/textureDimensions/08a62e.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba32sint, read>) -> i32
-fn textureDimensions_08a62e() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_08a62e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_08a62e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_08a62e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.hlsl
deleted file mode 100644
index 6a88619353..0000000000
--- a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_08a62e() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_08a62e();
-  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() {
-  textureDimensions_08a62e();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_08a62e();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.msl
deleted file mode 100644
index 07783303fc..0000000000
--- a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_08a62e(texture1d<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureDimensions_08a62e(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_08a62e(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_08a62e(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.spvasm
deleted file mode 100644
index c9e28f48a3..0000000000
--- a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_08a62e "textureDimensions_08a62e"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_08a62e = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %18
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_08a62e
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_08a62e
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_08a62e
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.wgsl
deleted file mode 100644
index 88c8b1420d..0000000000
--- a/test/intrinsics/gen/textureDimensions/08a62e.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba32sint, read>;
-
-fn textureDimensions_08a62e() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_08a62e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_08a62e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_08a62e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl b/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl
deleted file mode 100644
index 90d4113267..0000000000
--- a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba16float, read>) -> vec2<i32>
-fn textureDimensions_0a5fcf() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_0a5fcf();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_0a5fcf();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_0a5fcf();
-}
diff --git a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.hlsl
deleted file mode 100644
index 42b13d05f0..0000000000
--- a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_0a5fcf() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_0a5fcf();
-  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() {
-  textureDimensions_0a5fcf();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_0a5fcf();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.msl
deleted file mode 100644
index cbcbad08b0..0000000000
--- a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_0a5fcf(texture2d_array<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureDimensions_0a5fcf(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_0a5fcf(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_0a5fcf(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.spvasm
deleted file mode 100644
index a912652429..0000000000
--- a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_0a5fcf "textureDimensions_0a5fcf"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_0a5fcf = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %16 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_0a5fcf
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_0a5fcf
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_0a5fcf
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.wgsl
deleted file mode 100644
index e2c919ebb1..0000000000
--- a/test/intrinsics/gen/textureDimensions/0a5fcf.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16float, read>;
-
-fn textureDimensions_0a5fcf() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_0a5fcf();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_0a5fcf();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_0a5fcf();
-}
diff --git a/test/intrinsics/gen/textureDimensions/0bab57.wgsl b/test/intrinsics/gen/textureDimensions/0bab57.wgsl
deleted file mode 100644
index 58221cdbac..0000000000
--- a/test/intrinsics/gen/textureDimensions/0bab57.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba16sint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba16sint, read>) -> vec3<i32>
-fn textureDimensions_0bab57() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_0bab57();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_0bab57();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_0bab57();
-}
diff --git a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.hlsl
deleted file mode 100644
index b6704d7470..0000000000
--- a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_0bab57() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_0bab57();
-  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() {
-  textureDimensions_0bab57();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_0bab57();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.msl
deleted file mode 100644
index 96bd0b82bc..0000000000
--- a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_0bab57(texture3d<int, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureDimensions_0bab57(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_0bab57(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_0bab57(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.spvasm
deleted file mode 100644
index a7b100d9ad..0000000000
--- a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_0bab57 "textureDimensions_0bab57"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_0bab57 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_0bab57
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_0bab57
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_0bab57
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.wgsl
deleted file mode 100644
index abeb2b02bd..0000000000
--- a/test/intrinsics/gen/textureDimensions/0bab57.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba16sint, read>;
-
-fn textureDimensions_0bab57() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_0bab57();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_0bab57();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_0bab57();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1147d6.wgsl b/test/intrinsics/gen/textureDimensions/1147d6.wgsl
deleted file mode 100644
index 597a91ce75..0000000000
--- a/test/intrinsics/gen/textureDimensions/1147d6.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba16sint, read>) -> vec2<i32>
-fn textureDimensions_1147d6() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1147d6();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1147d6();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1147d6();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.hlsl
deleted file mode 100644
index 3257271dfc..0000000000
--- a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_1147d6() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_1147d6();
-  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() {
-  textureDimensions_1147d6();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_1147d6();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.msl
deleted file mode 100644
index bb3dcd0147..0000000000
--- a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_1147d6(texture2d_array<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureDimensions_1147d6(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_1147d6(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_1147d6(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.spvasm
deleted file mode 100644
index dfd8b2e42a..0000000000
--- a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_1147d6 "textureDimensions_1147d6"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_1147d6 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_1147d6
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_1147d6
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_1147d6
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.wgsl
deleted file mode 100644
index 8224775153..0000000000
--- a/test/intrinsics/gen/textureDimensions/1147d6.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16sint, read>;
-
-fn textureDimensions_1147d6() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1147d6();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1147d6();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1147d6();
-}
diff --git a/test/intrinsics/gen/textureDimensions/168fcc.wgsl b/test/intrinsics/gen/textureDimensions/168fcc.wgsl
deleted file mode 100644
index b991de0fcd..0000000000
--- a/test/intrinsics/gen/textureDimensions/168fcc.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8unorm, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba8unorm, read>) -> vec2<i32>
-fn textureDimensions_168fcc() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_168fcc();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_168fcc();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_168fcc();
-}
diff --git a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.hlsl
deleted file mode 100644
index 9575a8ac6b..0000000000
--- a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_168fcc() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_168fcc();
-  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() {
-  textureDimensions_168fcc();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_168fcc();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.msl
deleted file mode 100644
index cc414b3665..0000000000
--- a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_168fcc(texture2d<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureDimensions_168fcc(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_168fcc(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_168fcc(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.spvasm
deleted file mode 100644
index be89daf571..0000000000
--- a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_168fcc "textureDimensions_168fcc"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_168fcc = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v2int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_168fcc
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_168fcc
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_168fcc
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.wgsl
deleted file mode 100644
index 3f3e43e0e4..0000000000
--- a/test/intrinsics/gen/textureDimensions/168fcc.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8unorm, read>;
-
-fn textureDimensions_168fcc() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_168fcc();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_168fcc();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_168fcc();
-}
diff --git a/test/intrinsics/gen/textureDimensions/18bd57.wgsl b/test/intrinsics/gen/textureDimensions/18bd57.wgsl
deleted file mode 100644
index f0a09c8571..0000000000
--- a/test/intrinsics/gen/textureDimensions/18bd57.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rg32uint, read>) -> vec2<i32>
-fn textureDimensions_18bd57() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_18bd57();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_18bd57();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_18bd57();
-}
diff --git a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.hlsl
deleted file mode 100644
index 8eba869341..0000000000
--- a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_18bd57() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_18bd57();
-  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() {
-  textureDimensions_18bd57();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_18bd57();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.msl
deleted file mode 100644
index a2bf62b4c3..0000000000
--- a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_18bd57(texture2d_array<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureDimensions_18bd57(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_18bd57(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_18bd57(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.spvasm
deleted file mode 100644
index 45df877b2b..0000000000
--- a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.spvasm
+++ /dev/null
@@ -1,80 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_18bd57 "textureDimensions_18bd57"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %25 = OpConstantNull %v2int
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_18bd57 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %25
-         %22 = OpLoad %11 %arg_0
-         %20 = OpImageQuerySize %v3int %22
-         %17 = OpVectorShuffle %v2int %20 %20 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureDimensions_18bd57
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_18bd57
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureDimensions_18bd57
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.wgsl
deleted file mode 100644
index bb0c3caa84..0000000000
--- a/test/intrinsics/gen/textureDimensions/18bd57.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32uint, read>;
-
-fn textureDimensions_18bd57() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_18bd57();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_18bd57();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_18bd57();
-}
diff --git a/test/intrinsics/gen/textureDimensions/19bffc.wgsl b/test/intrinsics/gen/textureDimensions/19bffc.wgsl
deleted file mode 100644
index d85c7ab2e8..0000000000
--- a/test/intrinsics/gen/textureDimensions/19bffc.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rg32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rg32sint, read>) -> vec3<i32>
-fn textureDimensions_19bffc() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_19bffc();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_19bffc();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_19bffc();
-}
diff --git a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.hlsl
deleted file mode 100644
index 9ffde0f43e..0000000000
--- a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_19bffc() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_19bffc();
-  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() {
-  textureDimensions_19bffc();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_19bffc();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.msl
deleted file mode 100644
index 3899fc1ce0..0000000000
--- a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_19bffc(texture3d<int, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureDimensions_19bffc(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_19bffc(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_19bffc(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.spvasm
deleted file mode 100644
index 0d2385e9bc..0000000000
--- a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_19bffc "textureDimensions_19bffc"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_19bffc = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_19bffc
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_19bffc
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_19bffc
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.wgsl
deleted file mode 100644
index 7f56527049..0000000000
--- a/test/intrinsics/gen/textureDimensions/19bffc.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rg32sint, read>;
-
-fn textureDimensions_19bffc() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_19bffc();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_19bffc();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_19bffc();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl b/test/intrinsics/gen/textureDimensions/1a58e7.wgsl
deleted file mode 100644
index d897e38801..0000000000
--- a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8unorm, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba8unorm, read>) -> vec2<i32>
-fn textureDimensions_1a58e7() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1a58e7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1a58e7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1a58e7();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.hlsl
deleted file mode 100644
index c76087ace9..0000000000
--- a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_1a58e7() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_1a58e7();
-  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() {
-  textureDimensions_1a58e7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_1a58e7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.msl
deleted file mode 100644
index 88d6843b35..0000000000
--- a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_1a58e7(texture2d_array<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureDimensions_1a58e7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_1a58e7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_1a58e7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.spvasm
deleted file mode 100644
index f2ebb2601c..0000000000
--- a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_1a58e7 "textureDimensions_1a58e7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_1a58e7 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %16 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_1a58e7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_1a58e7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_1a58e7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.wgsl
deleted file mode 100644
index fe1cc3f221..0000000000
--- a/test/intrinsics/gen/textureDimensions/1a58e7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8unorm, read>;
-
-fn textureDimensions_1a58e7() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1a58e7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1a58e7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1a58e7();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1aa199.wgsl b/test/intrinsics/gen/textureDimensions/1aa199.wgsl
deleted file mode 100644
index 3a11a72eea..0000000000
--- a/test/intrinsics/gen/textureDimensions/1aa199.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba32sint, read>) -> vec2<i32>
-fn textureDimensions_1aa199() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1aa199();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1aa199();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1aa199();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.hlsl
deleted file mode 100644
index ae83ade991..0000000000
--- a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_1aa199() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_1aa199();
-  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() {
-  textureDimensions_1aa199();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_1aa199();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.msl
deleted file mode 100644
index db7f7961e9..0000000000
--- a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_1aa199(texture2d_array<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureDimensions_1aa199(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_1aa199(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_1aa199(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.spvasm
deleted file mode 100644
index 5006ca6b59..0000000000
--- a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_1aa199 "textureDimensions_1aa199"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_1aa199 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_1aa199
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_1aa199
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_1aa199
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.wgsl
deleted file mode 100644
index 26435e2cad..0000000000
--- a/test/intrinsics/gen/textureDimensions/1aa199.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32sint, read>;
-
-fn textureDimensions_1aa199() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1aa199();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1aa199();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1aa199();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1e189c.wgsl b/test/intrinsics/gen/textureDimensions/1e189c.wgsl
deleted file mode 100644
index f45c8b405b..0000000000
--- a/test/intrinsics/gen/textureDimensions/1e189c.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<r32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<r32sint, read>) -> vec3<i32>
-fn textureDimensions_1e189c() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1e189c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1e189c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1e189c();
-}
diff --git a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.hlsl
deleted file mode 100644
index bbc773967e..0000000000
--- a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_1e189c() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_1e189c();
-  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() {
-  textureDimensions_1e189c();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_1e189c();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.msl
deleted file mode 100644
index a79d9af646..0000000000
--- a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_1e189c(texture3d<int, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureDimensions_1e189c(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_1e189c(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_1e189c(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.spvasm
deleted file mode 100644
index 95f3ea0bc7..0000000000
--- a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_1e189c "textureDimensions_1e189c"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_1e189c = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_1e189c
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_1e189c
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_1e189c
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.wgsl
deleted file mode 100644
index ea4479823b..0000000000
--- a/test/intrinsics/gen/textureDimensions/1e189c.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<r32sint, read>;
-
-fn textureDimensions_1e189c() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_1e189c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_1e189c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_1e189c();
-}
diff --git a/test/intrinsics/gen/textureDimensions/214b7b.wgsl b/test/intrinsics/gen/textureDimensions/214b7b.wgsl
deleted file mode 100644
index 13d4efea0f..0000000000
--- a/test/intrinsics/gen/textureDimensions/214b7b.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rg32float, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rg32float, read>) -> i32
-fn textureDimensions_214b7b() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_214b7b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_214b7b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_214b7b();
-}
diff --git a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.hlsl
deleted file mode 100644
index f8b508533e..0000000000
--- a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_214b7b() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_214b7b();
-  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() {
-  textureDimensions_214b7b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_214b7b();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.msl
deleted file mode 100644
index 1bdb2b49be..0000000000
--- a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_214b7b(texture1d<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureDimensions_214b7b(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_214b7b(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_214b7b(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.spvasm
deleted file mode 100644
index e0cd411ac4..0000000000
--- a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_214b7b "textureDimensions_214b7b"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_214b7b = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %int %18
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_214b7b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_214b7b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_214b7b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.wgsl
deleted file mode 100644
index 6d0678c7ea..0000000000
--- a/test/intrinsics/gen/textureDimensions/214b7b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rg32float, read>;
-
-fn textureDimensions_214b7b() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_214b7b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_214b7b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_214b7b();
-}
diff --git a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl b/test/intrinsics/gen/textureDimensions/2d32ae.wgsl
deleted file mode 100644
index 8a6d293f22..0000000000
--- a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba32uint, read>) -> vec3<i32>
-fn textureDimensions_2d32ae() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_2d32ae();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_2d32ae();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_2d32ae();
-}
diff --git a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.hlsl
deleted file mode 100644
index 8ea6d4f751..0000000000
--- a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_2d32ae() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_2d32ae();
-  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() {
-  textureDimensions_2d32ae();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_2d32ae();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.msl
deleted file mode 100644
index c0a162b282..0000000000
--- a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_2d32ae(texture3d<uint, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureDimensions_2d32ae(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_2d32ae(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_2d32ae(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.spvasm
deleted file mode 100644
index 55f605f14c..0000000000
--- a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_2d32ae "textureDimensions_2d32ae"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %23 = OpConstantNull %v3int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_2d32ae = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_2d32ae
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_2d32ae
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_2d32ae
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.wgsl
deleted file mode 100644
index 606a542847..0000000000
--- a/test/intrinsics/gen/textureDimensions/2d32ae.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba32uint, read>;
-
-fn textureDimensions_2d32ae() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_2d32ae();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_2d32ae();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_2d32ae();
-}
diff --git a/test/intrinsics/gen/textureDimensions/2e0662.wgsl b/test/intrinsics/gen/textureDimensions/2e0662.wgsl
deleted file mode 100644
index 1f48f2f3db..0000000000
--- a/test/intrinsics/gen/textureDimensions/2e0662.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8snorm, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba8snorm, read>) -> vec2<i32>
-fn textureDimensions_2e0662() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_2e0662();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_2e0662();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_2e0662();
-}
diff --git a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.hlsl
deleted file mode 100644
index 6c1466a01f..0000000000
--- a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_2e0662() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_2e0662();
-  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() {
-  textureDimensions_2e0662();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_2e0662();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.msl
deleted file mode 100644
index 4bb2eda756..0000000000
--- a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_2e0662(texture2d<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureDimensions_2e0662(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_2e0662(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_2e0662(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.spvasm
deleted file mode 100644
index 118979e0ab..0000000000
--- a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_2e0662 "textureDimensions_2e0662"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_2e0662 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v2int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_2e0662
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_2e0662
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_2e0662
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.wgsl
deleted file mode 100644
index 5825096829..0000000000
--- a/test/intrinsics/gen/textureDimensions/2e0662.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8snorm, read>;
-
-fn textureDimensions_2e0662() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_2e0662();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_2e0662();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_2e0662();
-}
diff --git a/test/intrinsics/gen/textureDimensions/39a600.wgsl b/test/intrinsics/gen/textureDimensions/39a600.wgsl
deleted file mode 100644
index f1339d8018..0000000000
--- a/test/intrinsics/gen/textureDimensions/39a600.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<r32sint, read>) -> vec2<i32>
-fn textureDimensions_39a600() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_39a600();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_39a600();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_39a600();
-}
diff --git a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.hlsl
deleted file mode 100644
index 43050a021a..0000000000
--- a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_39a600() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_39a600();
-  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() {
-  textureDimensions_39a600();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_39a600();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.msl
deleted file mode 100644
index a9d077c375..0000000000
--- a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_39a600(texture2d_array<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureDimensions_39a600(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_39a600(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_39a600(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.spvasm
deleted file mode 100644
index 7637066b0a..0000000000
--- a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_39a600 "textureDimensions_39a600"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_39a600 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_39a600
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_39a600
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_39a600
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.wgsl
deleted file mode 100644
index f372f1cbd6..0000000000
--- a/test/intrinsics/gen/textureDimensions/39a600.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32sint, read>;
-
-fn textureDimensions_39a600() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_39a600();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_39a600();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_39a600();
-}
diff --git a/test/intrinsics/gen/textureDimensions/3d5817.wgsl b/test/intrinsics/gen/textureDimensions/3d5817.wgsl
deleted file mode 100644
index e4c4f60808..0000000000
--- a/test/intrinsics/gen/textureDimensions/3d5817.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba16uint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba16uint, read>) -> i32
-fn textureDimensions_3d5817() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_3d5817();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_3d5817();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_3d5817();
-}
diff --git a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.hlsl
deleted file mode 100644
index a398c9ab67..0000000000
--- a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_3d5817() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_3d5817();
-  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() {
-  textureDimensions_3d5817();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_3d5817();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.msl
deleted file mode 100644
index c959d2e210..0000000000
--- a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_3d5817(texture1d<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureDimensions_3d5817(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_3d5817(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_3d5817(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.spvasm
deleted file mode 100644
index 64833d3ad1..0000000000
--- a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_3d5817 "textureDimensions_3d5817"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %22 = OpConstantNull %int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_3d5817 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_3d5817
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_3d5817
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_3d5817
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.wgsl
deleted file mode 100644
index f9814ab40c..0000000000
--- a/test/intrinsics/gen/textureDimensions/3d5817.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba16uint, read>;
-
-fn textureDimensions_3d5817() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_3d5817();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_3d5817();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_3d5817();
-}
diff --git a/test/intrinsics/gen/textureDimensions/40bc10.wgsl b/test/intrinsics/gen/textureDimensions/40bc10.wgsl
deleted file mode 100644
index ff2b426618..0000000000
--- a/test/intrinsics/gen/textureDimensions/40bc10.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8uint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba8uint, read>) -> i32
-fn textureDimensions_40bc10() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_40bc10();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_40bc10();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_40bc10();
-}
diff --git a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.hlsl
deleted file mode 100644
index 9155192f1b..0000000000
--- a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_40bc10() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_40bc10();
-  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() {
-  textureDimensions_40bc10();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_40bc10();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.msl
deleted file mode 100644
index df410a48e8..0000000000
--- a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_40bc10(texture1d<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureDimensions_40bc10(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_40bc10(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_40bc10(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.spvasm
deleted file mode 100644
index 08a9327449..0000000000
--- a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_40bc10 "textureDimensions_40bc10"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %22 = OpConstantNull %int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_40bc10 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_40bc10
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_40bc10
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_40bc10
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.wgsl
deleted file mode 100644
index 98e946a49e..0000000000
--- a/test/intrinsics/gen/textureDimensions/40bc10.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8uint, read>;
-
-fn textureDimensions_40bc10() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_40bc10();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_40bc10();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_40bc10();
-}
diff --git a/test/intrinsics/gen/textureDimensions/441392.wgsl b/test/intrinsics/gen/textureDimensions/441392.wgsl
deleted file mode 100644
index 8db0f8f8f4..0000000000
--- a/test/intrinsics/gen/textureDimensions/441392.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rg32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rg32uint, read>) -> i32
-fn textureDimensions_441392() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_441392();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_441392();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_441392();
-}
diff --git a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.hlsl
deleted file mode 100644
index 9f48f454ad..0000000000
--- a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_441392() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_441392();
-  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() {
-  textureDimensions_441392();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_441392();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.msl
deleted file mode 100644
index 61be803bfd..0000000000
--- a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_441392(texture1d<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureDimensions_441392(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_441392(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_441392(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.spvasm
deleted file mode 100644
index 027c23b3aa..0000000000
--- a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_441392 "textureDimensions_441392"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %22 = OpConstantNull %int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_441392 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_441392
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_441392
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_441392
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.wgsl
deleted file mode 100644
index 47b6368515..0000000000
--- a/test/intrinsics/gen/textureDimensions/441392.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rg32uint, read>;
-
-fn textureDimensions_441392() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_441392();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_441392();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_441392();
-}
diff --git a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl b/test/intrinsics/gen/textureDimensions/48cbb2.wgsl
deleted file mode 100644
index c695272394..0000000000
--- a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rg32float, read>) -> vec2<i32>
-fn textureDimensions_48cbb2() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_48cbb2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_48cbb2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_48cbb2();
-}
diff --git a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.hlsl
deleted file mode 100644
index 75271e8986..0000000000
--- a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_48cbb2() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_48cbb2();
-  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() {
-  textureDimensions_48cbb2();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_48cbb2();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.msl
deleted file mode 100644
index 2fda9266cd..0000000000
--- a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_48cbb2(texture2d_array<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureDimensions_48cbb2(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_48cbb2(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_48cbb2(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.spvasm
deleted file mode 100644
index 21db059089..0000000000
--- a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_48cbb2 "textureDimensions_48cbb2"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_48cbb2 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %16 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_48cbb2
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_48cbb2
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_48cbb2
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.wgsl
deleted file mode 100644
index 2eaace9827..0000000000
--- a/test/intrinsics/gen/textureDimensions/48cbb2.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32float, read>;
-
-fn textureDimensions_48cbb2() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_48cbb2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_48cbb2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_48cbb2();
-}
diff --git a/test/intrinsics/gen/textureDimensions/48f360.wgsl b/test/intrinsics/gen/textureDimensions/48f360.wgsl
deleted file mode 100644
index 08bf63f75b..0000000000
--- a/test/intrinsics/gen/textureDimensions/48f360.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rg32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rg32sint, read>) -> vec2<i32>
-fn textureDimensions_48f360() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_48f360();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_48f360();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_48f360();
-}
diff --git a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.hlsl
deleted file mode 100644
index 38cb78eb40..0000000000
--- a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_48f360() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_48f360();
-  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() {
-  textureDimensions_48f360();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_48f360();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.msl
deleted file mode 100644
index 0ac8dfff91..0000000000
--- a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_48f360(texture2d<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureDimensions_48f360(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_48f360(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_48f360(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.spvasm
deleted file mode 100644
index 794771f165..0000000000
--- a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_48f360 "textureDimensions_48f360"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_48f360 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_48f360
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_48f360
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_48f360
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.wgsl
deleted file mode 100644
index 08c589929e..0000000000
--- a/test/intrinsics/gen/textureDimensions/48f360.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rg32sint, read>;
-
-fn textureDimensions_48f360() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_48f360();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_48f360();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_48f360();
-}
diff --git a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl b/test/intrinsics/gen/textureDimensions/56ccfa.wgsl
deleted file mode 100644
index 8726461828..0000000000
--- a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba16float, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba16float, read>) -> vec3<i32>
-fn textureDimensions_56ccfa() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_56ccfa();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_56ccfa();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_56ccfa();
-}
diff --git a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.hlsl
deleted file mode 100644
index 8af7f0b78f..0000000000
--- a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_56ccfa() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_56ccfa();
-  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() {
-  textureDimensions_56ccfa();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_56ccfa();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.msl
deleted file mode 100644
index 54de7f6637..0000000000
--- a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_56ccfa(texture3d<float, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureDimensions_56ccfa(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_56ccfa(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_56ccfa(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.spvasm
deleted file mode 100644
index 81c9798570..0000000000
--- a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_56ccfa "textureDimensions_56ccfa"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_56ccfa = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v3int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_56ccfa
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_56ccfa
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_56ccfa
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.wgsl
deleted file mode 100644
index 84837a5ebb..0000000000
--- a/test/intrinsics/gen/textureDimensions/56ccfa.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba16float, read>;
-
-fn textureDimensions_56ccfa() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_56ccfa();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_56ccfa();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_56ccfa();
-}
diff --git a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl b/test/intrinsics/gen/textureDimensions/57e7b3.wgsl
deleted file mode 100644
index 1c32e5e2fc..0000000000
--- a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8snorm, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba8snorm, read>) -> vec3<i32>
-fn textureDimensions_57e7b3() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_57e7b3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_57e7b3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_57e7b3();
-}
diff --git a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.hlsl
deleted file mode 100644
index c57772589e..0000000000
--- a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_57e7b3() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_57e7b3();
-  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() {
-  textureDimensions_57e7b3();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_57e7b3();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.msl
deleted file mode 100644
index 77a73bae63..0000000000
--- a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_57e7b3(texture3d<float, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureDimensions_57e7b3(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_57e7b3(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_57e7b3(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.spvasm
deleted file mode 100644
index da69f6df7d..0000000000
--- a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_57e7b3 "textureDimensions_57e7b3"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_57e7b3 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v3int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_57e7b3
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_57e7b3
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_57e7b3
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.wgsl
deleted file mode 100644
index b1ef3c8aab..0000000000
--- a/test/intrinsics/gen/textureDimensions/57e7b3.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8snorm, read>;
-
-fn textureDimensions_57e7b3() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_57e7b3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_57e7b3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_57e7b3();
-}
diff --git a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl b/test/intrinsics/gen/textureDimensions/66dc4e.wgsl
deleted file mode 100644
index 64a0c74315..0000000000
--- a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8snorm, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba8snorm, read>) -> vec2<i32>
-fn textureDimensions_66dc4e() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_66dc4e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_66dc4e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_66dc4e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.hlsl
deleted file mode 100644
index 9640966f55..0000000000
--- a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_66dc4e() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_66dc4e();
-  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() {
-  textureDimensions_66dc4e();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_66dc4e();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.msl
deleted file mode 100644
index c63df45902..0000000000
--- a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_66dc4e(texture2d_array<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureDimensions_66dc4e(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_66dc4e(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_66dc4e(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.spvasm
deleted file mode 100644
index 8a9555cfd9..0000000000
--- a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_66dc4e "textureDimensions_66dc4e"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_66dc4e = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %16 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_66dc4e
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_66dc4e
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_66dc4e
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.wgsl
deleted file mode 100644
index 313eef8064..0000000000
--- a/test/intrinsics/gen/textureDimensions/66dc4e.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8snorm, read>;
-
-fn textureDimensions_66dc4e() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_66dc4e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_66dc4e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_66dc4e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/670d90.wgsl b/test/intrinsics/gen/textureDimensions/670d90.wgsl
deleted file mode 100644
index b938c6a08a..0000000000
--- a/test/intrinsics/gen/textureDimensions/670d90.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rg32float, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rg32float, read>) -> vec3<i32>
-fn textureDimensions_670d90() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_670d90();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_670d90();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_670d90();
-}
diff --git a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.hlsl
deleted file mode 100644
index ae9acd9d68..0000000000
--- a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_670d90() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_670d90();
-  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() {
-  textureDimensions_670d90();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_670d90();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.msl
deleted file mode 100644
index ced98dca22..0000000000
--- a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_670d90(texture3d<float, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureDimensions_670d90(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_670d90(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_670d90(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.spvasm
deleted file mode 100644
index 10b5109494..0000000000
--- a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_670d90 "textureDimensions_670d90"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_670d90 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v3int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_670d90
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_670d90
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_670d90
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.wgsl
deleted file mode 100644
index bb261e499a..0000000000
--- a/test/intrinsics/gen/textureDimensions/670d90.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rg32float, read>;
-
-fn textureDimensions_670d90() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_670d90();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_670d90();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_670d90();
-}
diff --git a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl b/test/intrinsics/gen/textureDimensions/6c08ab.wgsl
deleted file mode 100644
index 3d37a45199..0000000000
--- a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba32float, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba32float, read>) -> i32
-fn textureDimensions_6c08ab() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_6c08ab();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_6c08ab();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_6c08ab();
-}
diff --git a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.hlsl
deleted file mode 100644
index a147dd21af..0000000000
--- a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_6c08ab() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_6c08ab();
-  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() {
-  textureDimensions_6c08ab();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_6c08ab();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.msl
deleted file mode 100644
index 0a73d8b405..0000000000
--- a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_6c08ab(texture1d<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureDimensions_6c08ab(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_6c08ab(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_6c08ab(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.spvasm
deleted file mode 100644
index e559ee8df2..0000000000
--- a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_6c08ab "textureDimensions_6c08ab"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_6c08ab = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %int %18
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_6c08ab
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_6c08ab
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_6c08ab
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.wgsl
deleted file mode 100644
index aa4ddff9d9..0000000000
--- a/test/intrinsics/gen/textureDimensions/6c08ab.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba32float, read>;
-
-fn textureDimensions_6c08ab() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_6c08ab();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_6c08ab();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_6c08ab();
-}
diff --git a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl b/test/intrinsics/gen/textureDimensions/6e2d12.wgsl
deleted file mode 100644
index 72accf2175..0000000000
--- a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8sint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba8sint, read>) -> i32
-fn textureDimensions_6e2d12() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_6e2d12();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_6e2d12();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_6e2d12();
-}
diff --git a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.hlsl
deleted file mode 100644
index 3a3b22724d..0000000000
--- a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_6e2d12() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_6e2d12();
-  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() {
-  textureDimensions_6e2d12();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_6e2d12();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.msl
deleted file mode 100644
index 75f81e5cff..0000000000
--- a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_6e2d12(texture1d<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureDimensions_6e2d12(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_6e2d12(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_6e2d12(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.spvasm
deleted file mode 100644
index 119c472e98..0000000000
--- a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_6e2d12 "textureDimensions_6e2d12"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_6e2d12 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %18
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_6e2d12
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_6e2d12
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_6e2d12
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.wgsl
deleted file mode 100644
index 69208e4ee9..0000000000
--- a/test/intrinsics/gen/textureDimensions/6e2d12.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8sint, read>;
-
-fn textureDimensions_6e2d12() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_6e2d12();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_6e2d12();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_6e2d12();
-}
diff --git a/test/intrinsics/gen/textureDimensions/70e26a.wgsl b/test/intrinsics/gen/textureDimensions/70e26a.wgsl
deleted file mode 100644
index 229f513d4a..0000000000
--- a/test/intrinsics/gen/textureDimensions/70e26a.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<r32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<r32uint, read>) -> i32
-fn textureDimensions_70e26a() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_70e26a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_70e26a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_70e26a();
-}
diff --git a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.hlsl
deleted file mode 100644
index d75545d53a..0000000000
--- a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_70e26a() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_70e26a();
-  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() {
-  textureDimensions_70e26a();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_70e26a();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.msl
deleted file mode 100644
index 25b04cda19..0000000000
--- a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_70e26a(texture1d<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureDimensions_70e26a(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_70e26a(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_70e26a(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.spvasm
deleted file mode 100644
index a15cb3ddb3..0000000000
--- a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_70e26a "textureDimensions_70e26a"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %22 = OpConstantNull %int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_70e26a = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_70e26a
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_70e26a
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_70e26a
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.wgsl
deleted file mode 100644
index 79b0099f8c..0000000000
--- a/test/intrinsics/gen/textureDimensions/70e26a.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<r32uint, read>;
-
-fn textureDimensions_70e26a() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_70e26a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_70e26a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_70e26a();
-}
diff --git a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl b/test/intrinsics/gen/textureDimensions/71e8f7.wgsl
deleted file mode 100644
index 02942b0396..0000000000
--- a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<r32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<r32uint, read>) -> vec2<i32>
-fn textureDimensions_71e8f7() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_71e8f7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_71e8f7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_71e8f7();
-}
diff --git a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.hlsl
deleted file mode 100644
index 7a0e27a785..0000000000
--- a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_71e8f7() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_71e8f7();
-  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() {
-  textureDimensions_71e8f7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_71e8f7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.msl
deleted file mode 100644
index 7f0020ea09..0000000000
--- a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_71e8f7(texture2d<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureDimensions_71e8f7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_71e8f7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_71e8f7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.spvasm
deleted file mode 100644
index 8c8753878c..0000000000
--- a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_71e8f7 "textureDimensions_71e8f7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %23 = OpConstantNull %v2int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_71e8f7 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_71e8f7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_71e8f7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_71e8f7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.wgsl
deleted file mode 100644
index f9a0ae1bf4..0000000000
--- a/test/intrinsics/gen/textureDimensions/71e8f7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<r32uint, read>;
-
-fn textureDimensions_71e8f7() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_71e8f7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_71e8f7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_71e8f7();
-}
diff --git a/test/intrinsics/gen/textureDimensions/770103.wgsl b/test/intrinsics/gen/textureDimensions/770103.wgsl
deleted file mode 100644
index c14f9659e0..0000000000
--- a/test/intrinsics/gen/textureDimensions/770103.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<r32float, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<r32float, read>) -> vec3<i32>
-fn textureDimensions_770103() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_770103();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_770103();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_770103();
-}
diff --git a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.hlsl
deleted file mode 100644
index a1a791a559..0000000000
--- a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_770103() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_770103();
-  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() {
-  textureDimensions_770103();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_770103();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.msl
deleted file mode 100644
index 6403d1e93c..0000000000
--- a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_770103(texture3d<float, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureDimensions_770103(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_770103(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_770103(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.spvasm
deleted file mode 100644
index fdaac94209..0000000000
--- a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_770103 "textureDimensions_770103"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_770103 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v3int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_770103
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_770103
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_770103
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.wgsl
deleted file mode 100644
index f05a399c97..0000000000
--- a/test/intrinsics/gen/textureDimensions/770103.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<r32float, read>;
-
-fn textureDimensions_770103() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_770103();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_770103();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_770103();
-}
diff --git a/test/intrinsics/gen/textureDimensions/82138e.wgsl b/test/intrinsics/gen/textureDimensions/82138e.wgsl
deleted file mode 100644
index 7ccfd89cdd..0000000000
--- a/test/intrinsics/gen/textureDimensions/82138e.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba16uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba16uint, read>) -> vec2<i32>
-fn textureDimensions_82138e() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_82138e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_82138e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_82138e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.hlsl
deleted file mode 100644
index 1f2d1e5f14..0000000000
--- a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_82138e() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_82138e();
-  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() {
-  textureDimensions_82138e();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_82138e();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.msl
deleted file mode 100644
index 139a274deb..0000000000
--- a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_82138e(texture2d<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureDimensions_82138e(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_82138e(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_82138e(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.spvasm
deleted file mode 100644
index e9fea45342..0000000000
--- a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_82138e "textureDimensions_82138e"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %23 = OpConstantNull %v2int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_82138e = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_82138e
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_82138e
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_82138e
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.wgsl
deleted file mode 100644
index 9b94e43f80..0000000000
--- a/test/intrinsics/gen/textureDimensions/82138e.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba16uint, read>;
-
-fn textureDimensions_82138e() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_82138e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_82138e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_82138e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8347ab.wgsl b/test/intrinsics/gen/textureDimensions/8347ab.wgsl
deleted file mode 100644
index 070fe9e14d..0000000000
--- a/test/intrinsics/gen/textureDimensions/8347ab.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8snorm, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba8snorm, read>) -> i32
-fn textureDimensions_8347ab() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8347ab();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8347ab();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8347ab();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.hlsl
deleted file mode 100644
index 84d60acff2..0000000000
--- a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_8347ab() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_8347ab();
-  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() {
-  textureDimensions_8347ab();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_8347ab();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.msl
deleted file mode 100644
index c4cb7a8dfb..0000000000
--- a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_8347ab(texture1d<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureDimensions_8347ab(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_8347ab(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_8347ab(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.spvasm
deleted file mode 100644
index 521be2bfcb..0000000000
--- a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_8347ab "textureDimensions_8347ab"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_8347ab = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %int %18
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_8347ab
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_8347ab
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_8347ab
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.wgsl
deleted file mode 100644
index e02c9fa065..0000000000
--- a/test/intrinsics/gen/textureDimensions/8347ab.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8snorm, read>;
-
-fn textureDimensions_8347ab() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8347ab();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8347ab();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8347ab();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8799ee.wgsl b/test/intrinsics/gen/textureDimensions/8799ee.wgsl
deleted file mode 100644
index 7f00316a89..0000000000
--- a/test/intrinsics/gen/textureDimensions/8799ee.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba32sint, read>) -> vec3<i32>
-fn textureDimensions_8799ee() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8799ee();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8799ee();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8799ee();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.hlsl
deleted file mode 100644
index 70a83d1710..0000000000
--- a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_8799ee() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_8799ee();
-  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() {
-  textureDimensions_8799ee();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_8799ee();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.msl
deleted file mode 100644
index 1c265e25f0..0000000000
--- a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_8799ee(texture3d<int, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureDimensions_8799ee(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_8799ee(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_8799ee(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.spvasm
deleted file mode 100644
index 385626f731..0000000000
--- a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_8799ee "textureDimensions_8799ee"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_8799ee = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_8799ee
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_8799ee
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_8799ee
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.wgsl
deleted file mode 100644
index cf61e0d7d4..0000000000
--- a/test/intrinsics/gen/textureDimensions/8799ee.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba32sint, read>;
-
-fn textureDimensions_8799ee() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8799ee();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8799ee();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8799ee();
-}
diff --git a/test/intrinsics/gen/textureDimensions/89a864.wgsl b/test/intrinsics/gen/textureDimensions/89a864.wgsl
deleted file mode 100644
index 818988060b..0000000000
--- a/test/intrinsics/gen/textureDimensions/89a864.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba16float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba16float, read>) -> vec2<i32>
-fn textureDimensions_89a864() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_89a864();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_89a864();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_89a864();
-}
diff --git a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.hlsl
deleted file mode 100644
index e6bb59d81f..0000000000
--- a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_89a864() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_89a864();
-  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() {
-  textureDimensions_89a864();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_89a864();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.msl
deleted file mode 100644
index fd69f0f58c..0000000000
--- a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_89a864(texture2d<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureDimensions_89a864(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_89a864(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_89a864(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.spvasm
deleted file mode 100644
index 8f178dc972..0000000000
--- a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_89a864 "textureDimensions_89a864"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_89a864 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v2int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_89a864
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_89a864
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_89a864
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.wgsl
deleted file mode 100644
index 12139b51d3..0000000000
--- a/test/intrinsics/gen/textureDimensions/89a864.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba16float, read>;
-
-fn textureDimensions_89a864() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_89a864();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_89a864();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_89a864();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl b/test/intrinsics/gen/textureDimensions/8b4fff.wgsl
deleted file mode 100644
index cf79e5301c..0000000000
--- a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba32sint, read>) -> vec2<i32>
-fn textureDimensions_8b4fff() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8b4fff();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8b4fff();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8b4fff();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.hlsl
deleted file mode 100644
index 8cdfa61acd..0000000000
--- a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_8b4fff() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_8b4fff();
-  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() {
-  textureDimensions_8b4fff();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_8b4fff();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.msl
deleted file mode 100644
index d5e68d59fa..0000000000
--- a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_8b4fff(texture2d<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureDimensions_8b4fff(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_8b4fff(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_8b4fff(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.spvasm
deleted file mode 100644
index eabe3a267f..0000000000
--- a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_8b4fff "textureDimensions_8b4fff"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_8b4fff = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_8b4fff
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_8b4fff
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_8b4fff
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.wgsl
deleted file mode 100644
index 1672d16e2e..0000000000
--- a/test/intrinsics/gen/textureDimensions/8b4fff.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba32sint, read>;
-
-fn textureDimensions_8b4fff() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8b4fff();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8b4fff();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8b4fff();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl b/test/intrinsics/gen/textureDimensions/8d89f8.wgsl
deleted file mode 100644
index 46b457d995..0000000000
--- a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<r32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<r32sint, read>) -> i32
-fn textureDimensions_8d89f8() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8d89f8();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8d89f8();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8d89f8();
-}
diff --git a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.hlsl
deleted file mode 100644
index fed7b1dea0..0000000000
--- a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_8d89f8() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_8d89f8();
-  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() {
-  textureDimensions_8d89f8();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_8d89f8();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.msl
deleted file mode 100644
index 4895ab3520..0000000000
--- a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_8d89f8(texture1d<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureDimensions_8d89f8(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_8d89f8(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_8d89f8(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.spvasm
deleted file mode 100644
index 9eb635a3b1..0000000000
--- a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_8d89f8 "textureDimensions_8d89f8"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_8d89f8 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %18
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_8d89f8
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_8d89f8
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_8d89f8
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.wgsl
deleted file mode 100644
index 8198734e85..0000000000
--- a/test/intrinsics/gen/textureDimensions/8d89f8.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<r32sint, read>;
-
-fn textureDimensions_8d89f8() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_8d89f8();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_8d89f8();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_8d89f8();
-}
diff --git a/test/intrinsics/gen/textureDimensions/924742.wgsl b/test/intrinsics/gen/textureDimensions/924742.wgsl
deleted file mode 100644
index fb8c3ae9ec..0000000000
--- a/test/intrinsics/gen/textureDimensions/924742.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rg32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rg32uint, read>) -> vec3<i32>
-fn textureDimensions_924742() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_924742();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_924742();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_924742();
-}
diff --git a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.hlsl
deleted file mode 100644
index 8e2e6a471d..0000000000
--- a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_924742() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_924742();
-  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() {
-  textureDimensions_924742();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_924742();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.msl
deleted file mode 100644
index 2d3075da0f..0000000000
--- a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_924742(texture3d<uint, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureDimensions_924742(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_924742(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_924742(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.spvasm
deleted file mode 100644
index fa55bd2b77..0000000000
--- a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_924742 "textureDimensions_924742"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %23 = OpConstantNull %v3int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_924742 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_924742
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_924742
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_924742
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.wgsl
deleted file mode 100644
index 265710887b..0000000000
--- a/test/intrinsics/gen/textureDimensions/924742.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rg32uint, read>;
-
-fn textureDimensions_924742() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_924742();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_924742();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_924742();
-}
diff --git a/test/intrinsics/gen/textureDimensions/92ad20.wgsl b/test/intrinsics/gen/textureDimensions/92ad20.wgsl
deleted file mode 100644
index 4ab9db4c30..0000000000
--- a/test/intrinsics/gen/textureDimensions/92ad20.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8uint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba8uint, read>) -> vec3<i32>
-fn textureDimensions_92ad20() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_92ad20();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_92ad20();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_92ad20();
-}
diff --git a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.hlsl
deleted file mode 100644
index d0d1d50b34..0000000000
--- a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_92ad20() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_92ad20();
-  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() {
-  textureDimensions_92ad20();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_92ad20();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.msl
deleted file mode 100644
index b9dda62f9a..0000000000
--- a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_92ad20(texture3d<uint, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureDimensions_92ad20(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_92ad20(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_92ad20(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.spvasm
deleted file mode 100644
index 11639fbcd7..0000000000
--- a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_92ad20 "textureDimensions_92ad20"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %23 = OpConstantNull %v3int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_92ad20 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_92ad20
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_92ad20
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_92ad20
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.wgsl
deleted file mode 100644
index 3a5baa9f2d..0000000000
--- a/test/intrinsics/gen/textureDimensions/92ad20.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8uint, read>;
-
-fn textureDimensions_92ad20() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_92ad20();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_92ad20();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_92ad20();
-}
diff --git a/test/intrinsics/gen/textureDimensions/9572e5.wgsl b/test/intrinsics/gen/textureDimensions/9572e5.wgsl
deleted file mode 100644
index 2f6bb15dd8..0000000000
--- a/test/intrinsics/gen/textureDimensions/9572e5.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8unorm, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba8unorm, read>) -> vec3<i32>
-fn textureDimensions_9572e5() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_9572e5();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_9572e5();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_9572e5();
-}
diff --git a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.hlsl
deleted file mode 100644
index 517c9ba345..0000000000
--- a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_9572e5() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_9572e5();
-  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() {
-  textureDimensions_9572e5();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_9572e5();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.msl
deleted file mode 100644
index daf5cc1c37..0000000000
--- a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_9572e5(texture3d<float, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureDimensions_9572e5(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_9572e5(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_9572e5(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.spvasm
deleted file mode 100644
index d95a0df76f..0000000000
--- a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_9572e5 "textureDimensions_9572e5"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_9572e5 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v3int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_9572e5
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_9572e5
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_9572e5
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.wgsl
deleted file mode 100644
index 851ba4790c..0000000000
--- a/test/intrinsics/gen/textureDimensions/9572e5.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8unorm, read>;
-
-fn textureDimensions_9572e5() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_9572e5();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_9572e5();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_9572e5();
-}
diff --git a/test/intrinsics/gen/textureDimensions/998f6b.wgsl b/test/intrinsics/gen/textureDimensions/998f6b.wgsl
deleted file mode 100644
index 38509f7607..0000000000
--- a/test/intrinsics/gen/textureDimensions/998f6b.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba32uint, read>) -> vec2<i32>
-fn textureDimensions_998f6b() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_998f6b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_998f6b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_998f6b();
-}
diff --git a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.hlsl
deleted file mode 100644
index d0ef4957c1..0000000000
--- a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_998f6b() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_998f6b();
-  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() {
-  textureDimensions_998f6b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_998f6b();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.msl
deleted file mode 100644
index a3191ae84d..0000000000
--- a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_998f6b(texture2d_array<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureDimensions_998f6b(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_998f6b(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_998f6b(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.spvasm
deleted file mode 100644
index 2073a4e63c..0000000000
--- a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_998f6b "textureDimensions_998f6b"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %25 = OpConstantNull %v2int
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_998f6b = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %25
-         %22 = OpLoad %11 %arg_0
-         %20 = OpImageQuerySize %v3int %22
-         %17 = OpVectorShuffle %v2int %20 %20 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureDimensions_998f6b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_998f6b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureDimensions_998f6b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.wgsl
deleted file mode 100644
index f1c7b2ba4e..0000000000
--- a/test/intrinsics/gen/textureDimensions/998f6b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32uint, read>;
-
-fn textureDimensions_998f6b() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_998f6b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_998f6b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_998f6b();
-}
diff --git a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl b/test/intrinsics/gen/textureDimensions/a0aad1.wgsl
deleted file mode 100644
index 5eff90d75d..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<r32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<r32sint, read>) -> vec2<i32>
-fn textureDimensions_a0aad1() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_a0aad1();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_a0aad1();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_a0aad1();
-}
diff --git a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.hlsl
deleted file mode 100644
index ddef3c0724..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_a0aad1() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_a0aad1();
-  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() {
-  textureDimensions_a0aad1();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_a0aad1();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.msl
deleted file mode 100644
index c3151b2cad..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_a0aad1(texture2d<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureDimensions_a0aad1(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_a0aad1(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_a0aad1(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.spvasm
deleted file mode 100644
index 6960bea1e7..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_a0aad1 "textureDimensions_a0aad1"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_a0aad1 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_a0aad1
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_a0aad1
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_a0aad1
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.wgsl
deleted file mode 100644
index 45795be10d..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0aad1.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<r32sint, read>;
-
-fn textureDimensions_a0aad1() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_a0aad1();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_a0aad1();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_a0aad1();
-}
diff --git a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl b/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl
deleted file mode 100644
index 72b90c761b..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8sint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba8sint, read>) -> vec3<i32>
-fn textureDimensions_a0e4ec() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_a0e4ec();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_a0e4ec();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_a0e4ec();
-}
diff --git a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.hlsl
deleted file mode 100644
index e1f4e62d91..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_a0e4ec() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_a0e4ec();
-  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() {
-  textureDimensions_a0e4ec();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_a0e4ec();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.msl
deleted file mode 100644
index 8cd2e7cfb2..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_a0e4ec(texture3d<int, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureDimensions_a0e4ec(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_a0e4ec(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_a0e4ec(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.spvasm
deleted file mode 100644
index 91531ce62d..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_a0e4ec "textureDimensions_a0e4ec"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_a0e4ec = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_a0e4ec
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_a0e4ec
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_a0e4ec
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.wgsl
deleted file mode 100644
index 5a33cbafdb..0000000000
--- a/test/intrinsics/gen/textureDimensions/a0e4ec.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8sint, read>;
-
-fn textureDimensions_a0e4ec() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_a0e4ec();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_a0e4ec();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_a0e4ec();
-}
diff --git a/test/intrinsics/gen/textureDimensions/ae457f.wgsl b/test/intrinsics/gen/textureDimensions/ae457f.wgsl
deleted file mode 100644
index 5151575bb2..0000000000
--- a/test/intrinsics/gen/textureDimensions/ae457f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba16uint, read>) -> vec2<i32>
-fn textureDimensions_ae457f() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_ae457f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_ae457f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_ae457f();
-}
diff --git a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.hlsl
deleted file mode 100644
index a5f1b3b817..0000000000
--- a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_ae457f() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_ae457f();
-  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() {
-  textureDimensions_ae457f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_ae457f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.msl
deleted file mode 100644
index 1d6600bd7b..0000000000
--- a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_ae457f(texture2d_array<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureDimensions_ae457f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_ae457f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_ae457f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.spvasm
deleted file mode 100644
index a0f37caad5..0000000000
--- a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_ae457f "textureDimensions_ae457f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %25 = OpConstantNull %v2int
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_ae457f = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %25
-         %22 = OpLoad %11 %arg_0
-         %20 = OpImageQuerySize %v3int %22
-         %17 = OpVectorShuffle %v2int %20 %20 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureDimensions_ae457f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_ae457f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureDimensions_ae457f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.wgsl
deleted file mode 100644
index 46d164e027..0000000000
--- a/test/intrinsics/gen/textureDimensions/ae457f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16uint, read>;
-
-fn textureDimensions_ae457f() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_ae457f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_ae457f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_ae457f();
-}
diff --git a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl b/test/intrinsics/gen/textureDimensions/ba6e15.wgsl
deleted file mode 100644
index 04b254d401..0000000000
--- a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<r32float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<r32float, read>) -> vec2<i32>
-fn textureDimensions_ba6e15() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_ba6e15();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_ba6e15();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_ba6e15();
-}
diff --git a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.hlsl
deleted file mode 100644
index 753e15a5d9..0000000000
--- a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_ba6e15() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_ba6e15();
-  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() {
-  textureDimensions_ba6e15();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_ba6e15();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.msl
deleted file mode 100644
index 443894fcf3..0000000000
--- a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_ba6e15(texture2d<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureDimensions_ba6e15(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_ba6e15(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_ba6e15(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.spvasm
deleted file mode 100644
index 404e706bb5..0000000000
--- a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_ba6e15 "textureDimensions_ba6e15"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_ba6e15 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v2int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_ba6e15
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_ba6e15
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_ba6e15
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.wgsl
deleted file mode 100644
index cd4ead88ff..0000000000
--- a/test/intrinsics/gen/textureDimensions/ba6e15.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<r32float, read>;
-
-fn textureDimensions_ba6e15() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_ba6e15();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_ba6e15();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_ba6e15();
-}
diff --git a/test/intrinsics/gen/textureDimensions/c2215f.wgsl b/test/intrinsics/gen/textureDimensions/c2215f.wgsl
deleted file mode 100644
index 3ff3c75fd4..0000000000
--- a/test/intrinsics/gen/textureDimensions/c2215f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<r32float, read>) -> vec2<i32>
-fn textureDimensions_c2215f() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_c2215f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_c2215f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_c2215f();
-}
diff --git a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.hlsl
deleted file mode 100644
index d4ab15be5d..0000000000
--- a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_c2215f() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_c2215f();
-  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() {
-  textureDimensions_c2215f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_c2215f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.msl
deleted file mode 100644
index 8f93f48035..0000000000
--- a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_c2215f(texture2d_array<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureDimensions_c2215f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_c2215f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_c2215f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.spvasm
deleted file mode 100644
index b70a750725..0000000000
--- a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_c2215f "textureDimensions_c2215f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_c2215f = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %16 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_c2215f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_c2215f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_c2215f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.wgsl
deleted file mode 100644
index 9a528c4b8a..0000000000
--- a/test/intrinsics/gen/textureDimensions/c2215f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32float, read>;
-
-fn textureDimensions_c2215f() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_c2215f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_c2215f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_c2215f();
-}
diff --git a/test/intrinsics/gen/textureDimensions/c60b66.wgsl b/test/intrinsics/gen/textureDimensions/c60b66.wgsl
deleted file mode 100644
index 9a1a172b84..0000000000
--- a/test/intrinsics/gen/textureDimensions/c60b66.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba16sint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba16sint, read>) -> i32
-fn textureDimensions_c60b66() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_c60b66();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_c60b66();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_c60b66();
-}
diff --git a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.hlsl
deleted file mode 100644
index 63586a643b..0000000000
--- a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_c60b66() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_c60b66();
-  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() {
-  textureDimensions_c60b66();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_c60b66();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.msl
deleted file mode 100644
index 18ed4f3fb0..0000000000
--- a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_c60b66(texture1d<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureDimensions_c60b66(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_c60b66(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_c60b66(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.spvasm
deleted file mode 100644
index fe18056c78..0000000000
--- a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_c60b66 "textureDimensions_c60b66"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_c60b66 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %18
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_c60b66
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_c60b66
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_c60b66
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.wgsl
deleted file mode 100644
index c291bc6152..0000000000
--- a/test/intrinsics/gen/textureDimensions/c60b66.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba16sint, read>;
-
-fn textureDimensions_c60b66() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_c60b66();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_c60b66();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_c60b66();
-}
diff --git a/test/intrinsics/gen/textureDimensions/c74533.wgsl b/test/intrinsics/gen/textureDimensions/c74533.wgsl
deleted file mode 100644
index b56d74237f..0000000000
--- a/test/intrinsics/gen/textureDimensions/c74533.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba32uint, read>) -> vec2<i32>
-fn textureDimensions_c74533() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_c74533();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_c74533();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_c74533();
-}
diff --git a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.hlsl
deleted file mode 100644
index 01fbf35021..0000000000
--- a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_c74533() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_c74533();
-  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() {
-  textureDimensions_c74533();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_c74533();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.msl
deleted file mode 100644
index 006d2001cf..0000000000
--- a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_c74533(texture2d<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureDimensions_c74533(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_c74533(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_c74533(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.spvasm
deleted file mode 100644
index 0ca17603fa..0000000000
--- a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_c74533 "textureDimensions_c74533"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %23 = OpConstantNull %v2int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_c74533 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_c74533
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_c74533
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_c74533
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.wgsl
deleted file mode 100644
index 37e6ffb208..0000000000
--- a/test/intrinsics/gen/textureDimensions/c74533.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba32uint, read>;
-
-fn textureDimensions_c74533() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_c74533();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_c74533();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_c74533();
-}
diff --git a/test/intrinsics/gen/textureDimensions/caaabb.wgsl b/test/intrinsics/gen/textureDimensions/caaabb.wgsl
deleted file mode 100644
index 9f09942a8f..0000000000
--- a/test/intrinsics/gen/textureDimensions/caaabb.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rg32sint, read>) -> vec2<i32>
-fn textureDimensions_caaabb() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_caaabb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_caaabb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_caaabb();
-}
diff --git a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.hlsl
deleted file mode 100644
index b29004e817..0000000000
--- a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_caaabb() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_caaabb();
-  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() {
-  textureDimensions_caaabb();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_caaabb();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.msl
deleted file mode 100644
index fb9f63e1cb..0000000000
--- a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_caaabb(texture2d_array<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureDimensions_caaabb(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_caaabb(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_caaabb(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.spvasm
deleted file mode 100644
index 545e9ced04..0000000000
--- a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_caaabb "textureDimensions_caaabb"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_caaabb = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_caaabb
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_caaabb
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_caaabb
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.wgsl
deleted file mode 100644
index 1b22e442cf..0000000000
--- a/test/intrinsics/gen/textureDimensions/caaabb.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32sint, read>;
-
-fn textureDimensions_caaabb() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_caaabb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_caaabb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_caaabb();
-}
diff --git a/test/intrinsics/gen/textureDimensions/cc5478.wgsl b/test/intrinsics/gen/textureDimensions/cc5478.wgsl
deleted file mode 100644
index 851a699a64..0000000000
--- a/test/intrinsics/gen/textureDimensions/cc5478.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8unorm, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba8unorm, read>) -> i32
-fn textureDimensions_cc5478() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_cc5478();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_cc5478();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_cc5478();
-}
diff --git a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.hlsl
deleted file mode 100644
index da22ba1bab..0000000000
--- a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_cc5478() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_cc5478();
-  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() {
-  textureDimensions_cc5478();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_cc5478();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.msl
deleted file mode 100644
index 8fed3812b9..0000000000
--- a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_cc5478(texture1d<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureDimensions_cc5478(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_cc5478(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_cc5478(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.spvasm
deleted file mode 100644
index a850b0bb19..0000000000
--- a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_cc5478 "textureDimensions_cc5478"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_cc5478 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %int %18
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_cc5478
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_cc5478
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_cc5478
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.wgsl
deleted file mode 100644
index cd6cde8042..0000000000
--- a/test/intrinsics/gen/textureDimensions/cc5478.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8unorm, read>;
-
-fn textureDimensions_cc5478() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_cc5478();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_cc5478();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_cc5478();
-}
diff --git a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl b/test/intrinsics/gen/textureDimensions/cdaff9.wgsl
deleted file mode 100644
index d3fdf9d7b6..0000000000
--- a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba32float, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba32float, read>) -> vec3<i32>
-fn textureDimensions_cdaff9() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_cdaff9();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_cdaff9();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_cdaff9();
-}
diff --git a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.hlsl
deleted file mode 100644
index 430b96817f..0000000000
--- a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_cdaff9() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_cdaff9();
-  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() {
-  textureDimensions_cdaff9();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_cdaff9();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.msl
deleted file mode 100644
index 818ca1af74..0000000000
--- a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_cdaff9(texture3d<float, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureDimensions_cdaff9(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_cdaff9(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_cdaff9(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.spvasm
deleted file mode 100644
index db04d25a09..0000000000
--- a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_cdaff9 "textureDimensions_cdaff9"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %22 = OpConstantNull %v3int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_cdaff9 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v3int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_cdaff9
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_cdaff9
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_cdaff9
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.wgsl
deleted file mode 100644
index 066e3991c4..0000000000
--- a/test/intrinsics/gen/textureDimensions/cdaff9.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba32float, read>;
-
-fn textureDimensions_cdaff9() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_cdaff9();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_cdaff9();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_cdaff9();
-}
diff --git a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl b/test/intrinsics/gen/textureDimensions/cf1d42.wgsl
deleted file mode 100644
index a96b1cee1d..0000000000
--- a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba16float, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba16float, read>) -> i32
-fn textureDimensions_cf1d42() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_cf1d42();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_cf1d42();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_cf1d42();
-}
diff --git a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.hlsl
deleted file mode 100644
index 00a4e6c9a3..0000000000
--- a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_cf1d42() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_cf1d42();
-  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() {
-  textureDimensions_cf1d42();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_cf1d42();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.msl
deleted file mode 100644
index 6b70bc0c76..0000000000
--- a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_cf1d42(texture1d<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureDimensions_cf1d42(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_cf1d42(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_cf1d42(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.spvasm
deleted file mode 100644
index ecc9d6b69c..0000000000
--- a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_cf1d42 "textureDimensions_cf1d42"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_cf1d42 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %int %18
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_cf1d42
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_cf1d42
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_cf1d42
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.wgsl
deleted file mode 100644
index 1b57b7a56a..0000000000
--- a/test/intrinsics/gen/textureDimensions/cf1d42.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba16float, read>;
-
-fn textureDimensions_cf1d42() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_cf1d42();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_cf1d42();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_cf1d42();
-}
diff --git a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl b/test/intrinsics/gen/textureDimensions/d40b9e.wgsl
deleted file mode 100644
index 1489f5a5d9..0000000000
--- a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba8sint, read>) -> vec2<i32>
-fn textureDimensions_d40b9e() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_d40b9e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_d40b9e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_d40b9e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.hlsl
deleted file mode 100644
index 82496df7b0..0000000000
--- a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_d40b9e() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_d40b9e();
-  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() {
-  textureDimensions_d40b9e();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_d40b9e();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.msl
deleted file mode 100644
index e2a0a81df1..0000000000
--- a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_d40b9e(texture2d<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureDimensions_d40b9e(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_d40b9e(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_d40b9e(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.spvasm
deleted file mode 100644
index ac92139511..0000000000
--- a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_d40b9e "textureDimensions_d40b9e"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_d40b9e = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_d40b9e
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_d40b9e
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_d40b9e
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.wgsl
deleted file mode 100644
index 365cf631ab..0000000000
--- a/test/intrinsics/gen/textureDimensions/d40b9e.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8sint, read>;
-
-fn textureDimensions_d40b9e() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_d40b9e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_d40b9e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_d40b9e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/d4106f.wgsl b/test/intrinsics/gen/textureDimensions/d4106f.wgsl
deleted file mode 100644
index d80fe364dd..0000000000
--- a/test/intrinsics/gen/textureDimensions/d4106f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba16sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba16sint, read>) -> vec2<i32>
-fn textureDimensions_d4106f() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_d4106f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_d4106f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_d4106f();
-}
diff --git a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.hlsl
deleted file mode 100644
index 5d2fdc9a9e..0000000000
--- a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_d4106f() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_d4106f();
-  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() {
-  textureDimensions_d4106f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_d4106f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.msl
deleted file mode 100644
index dfc81051b7..0000000000
--- a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_d4106f(texture2d<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureDimensions_d4106f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_d4106f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_d4106f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.spvasm
deleted file mode 100644
index 8a0011bf47..0000000000
--- a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_d4106f "textureDimensions_d4106f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_d4106f = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_d4106f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_d4106f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_d4106f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.wgsl
deleted file mode 100644
index 6771134340..0000000000
--- a/test/intrinsics/gen/textureDimensions/d4106f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba16sint, read>;
-
-fn textureDimensions_d4106f() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_d4106f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_d4106f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_d4106f();
-}
diff --git a/test/intrinsics/gen/textureDimensions/d8f951.wgsl b/test/intrinsics/gen/textureDimensions/d8f951.wgsl
deleted file mode 100644
index 59e8548651..0000000000
--- a/test/intrinsics/gen/textureDimensions/d8f951.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<r32float, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<r32float, read>) -> i32
-fn textureDimensions_d8f951() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_d8f951();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_d8f951();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_d8f951();
-}
diff --git a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.hlsl
deleted file mode 100644
index 7443f2f738..0000000000
--- a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_d8f951() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_d8f951();
-  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() {
-  textureDimensions_d8f951();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_d8f951();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.msl
deleted file mode 100644
index aebf66dabc..0000000000
--- a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_d8f951(texture1d<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureDimensions_d8f951(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_d8f951(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_d8f951(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.spvasm
deleted file mode 100644
index 919cb7b75c..0000000000
--- a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_d8f951 "textureDimensions_d8f951"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_d8f951 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %int %18
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_d8f951
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_d8f951
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_d8f951
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.wgsl
deleted file mode 100644
index 125661b416..0000000000
--- a/test/intrinsics/gen/textureDimensions/d8f951.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<r32float, read>;
-
-fn textureDimensions_d8f951() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_d8f951();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_d8f951();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_d8f951();
-}
diff --git a/test/intrinsics/gen/textureDimensions/da3099.wgsl b/test/intrinsics/gen/textureDimensions/da3099.wgsl
deleted file mode 100644
index 1d59c2bc91..0000000000
--- a/test/intrinsics/gen/textureDimensions/da3099.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba16uint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<rgba16uint, read>) -> vec3<i32>
-fn textureDimensions_da3099() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_da3099();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_da3099();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_da3099();
-}
diff --git a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.hlsl
deleted file mode 100644
index 5e9100225b..0000000000
--- a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_da3099() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_da3099();
-  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() {
-  textureDimensions_da3099();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_da3099();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.msl
deleted file mode 100644
index 5d79ee6730..0000000000
--- a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_da3099(texture3d<uint, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureDimensions_da3099(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_da3099(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_da3099(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.spvasm
deleted file mode 100644
index 9682008382..0000000000
--- a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_da3099 "textureDimensions_da3099"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %23 = OpConstantNull %v3int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_da3099 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_da3099
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_da3099
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_da3099
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.wgsl
deleted file mode 100644
index bfe27c3c10..0000000000
--- a/test/intrinsics/gen/textureDimensions/da3099.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba16uint, read>;
-
-fn textureDimensions_da3099() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_da3099();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_da3099();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_da3099();
-}
diff --git a/test/intrinsics/gen/textureDimensions/dba47c.wgsl b/test/intrinsics/gen/textureDimensions/dba47c.wgsl
deleted file mode 100644
index e92bceac48..0000000000
--- a/test/intrinsics/gen/textureDimensions/dba47c.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rgba32uint, read>) -> i32
-fn textureDimensions_dba47c() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_dba47c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_dba47c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_dba47c();
-}
diff --git a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.hlsl
deleted file mode 100644
index 8bc76819eb..0000000000
--- a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_dba47c() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_dba47c();
-  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() {
-  textureDimensions_dba47c();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_dba47c();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.msl
deleted file mode 100644
index ee47c9832c..0000000000
--- a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_dba47c(texture1d<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureDimensions_dba47c(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_dba47c(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_dba47c(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.spvasm
deleted file mode 100644
index 128437c3ca..0000000000
--- a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_dba47c "textureDimensions_dba47c"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-%_ptr_Function_int = OpTypePointer Function %int
-         %22 = OpConstantNull %int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_dba47c = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %22
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %19
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_dba47c
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_dba47c
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_dba47c
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.wgsl
deleted file mode 100644
index 83e8035aaf..0000000000
--- a/test/intrinsics/gen/textureDimensions/dba47c.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba32uint, read>;
-
-fn textureDimensions_dba47c() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_dba47c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_dba47c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_dba47c();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e10157.wgsl b/test/intrinsics/gen/textureDimensions/e10157.wgsl
deleted file mode 100644
index 03f647fcd7..0000000000
--- a/test/intrinsics/gen/textureDimensions/e10157.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba8uint, read>) -> vec2<i32>
-fn textureDimensions_e10157() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e10157();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e10157();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e10157();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.hlsl
deleted file mode 100644
index c8edf590ce..0000000000
--- a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_e10157() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_e10157();
-  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() {
-  textureDimensions_e10157();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_e10157();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.msl
deleted file mode 100644
index 1c43655ec3..0000000000
--- a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_e10157(texture2d<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureDimensions_e10157(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_e10157(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_e10157(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.spvasm
deleted file mode 100644
index 923452faf3..0000000000
--- a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_e10157 "textureDimensions_e10157"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %23 = OpConstantNull %v2int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_e10157 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_e10157
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_e10157
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_e10157
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.wgsl
deleted file mode 100644
index 01d8e5d7bf..0000000000
--- a/test/intrinsics/gen/textureDimensions/e10157.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8uint, read>;
-
-fn textureDimensions_e10157() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e10157();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e10157();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e10157();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e93464.wgsl b/test/intrinsics/gen/textureDimensions/e93464.wgsl
deleted file mode 100644
index 1648472ff6..0000000000
--- a/test/intrinsics/gen/textureDimensions/e93464.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rg32sint, read>;
-
-// fn textureDimensions(texture: texture_storage_1d<rg32sint, read>) -> i32
-fn textureDimensions_e93464() {
-  var res: i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e93464();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e93464();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e93464();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.hlsl
deleted file mode 100644
index de06d738ef..0000000000
--- a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_e93464() {
-  int tint_tmp;
-  arg_0.GetDimensions(tint_tmp);
-  int res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_e93464();
-  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() {
-  textureDimensions_e93464();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_e93464();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.msl
deleted file mode 100644
index 29bd4d8e87..0000000000
--- a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_e93464(texture1d<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_width());
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureDimensions_e93464(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_e93464(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_e93464(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.spvasm
deleted file mode 100644
index fc72f55cbb..0000000000
--- a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_e93464 "textureDimensions_e93464"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-%_ptr_Function_int = OpTypePointer Function %int
-         %21 = OpConstantNull %int
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_e93464 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %21
-         %18 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %int %18
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureDimensions_e93464
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureDimensions_e93464
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_e93464
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.wgsl
deleted file mode 100644
index 2f231853fe..0000000000
--- a/test/intrinsics/gen/textureDimensions/e93464.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rg32sint, read>;
-
-fn textureDimensions_e93464() {
-  var res : i32 = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e93464();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e93464();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e93464();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9628c.wgsl b/test/intrinsics/gen/textureDimensions/e9628c.wgsl
deleted file mode 100644
index 99e15ea5fe..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9628c.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba32float, read>) -> vec2<i32>
-fn textureDimensions_e9628c() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e9628c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e9628c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e9628c();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.hlsl
deleted file mode 100644
index 779750b759..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_e9628c() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_e9628c();
-  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() {
-  textureDimensions_e9628c();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_e9628c();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.msl
deleted file mode 100644
index f3c4ae69c5..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_e9628c(texture2d_array<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureDimensions_e9628c(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_e9628c(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_e9628c(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.spvasm
deleted file mode 100644
index 29c53909cb..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_e9628c "textureDimensions_e9628c"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_e9628c = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %16 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_e9628c
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_e9628c
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_e9628c
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.wgsl
deleted file mode 100644
index e131d9908f..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9628c.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32float, read>;
-
-fn textureDimensions_e9628c() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e9628c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e9628c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e9628c();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl b/test/intrinsics/gen/textureDimensions/e9fe54.wgsl
deleted file mode 100644
index 35e85c8ede..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rg32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rg32uint, read>) -> vec2<i32>
-fn textureDimensions_e9fe54() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e9fe54();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e9fe54();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e9fe54();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.hlsl
deleted file mode 100644
index a989d5e03e..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_e9fe54() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_e9fe54();
-  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() {
-  textureDimensions_e9fe54();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_e9fe54();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.msl
deleted file mode 100644
index 3fed85eb0e..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_e9fe54(texture2d<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureDimensions_e9fe54(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_e9fe54(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_e9fe54(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.spvasm
deleted file mode 100644
index ac10439071..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_e9fe54 "textureDimensions_e9fe54"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %23 = OpConstantNull %v2int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_e9fe54 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v2int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_e9fe54
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_e9fe54
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_e9fe54
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.wgsl
deleted file mode 100644
index 427336439d..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe54.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rg32uint, read>;
-
-fn textureDimensions_e9fe54() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e9fe54();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e9fe54();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e9fe54();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl b/test/intrinsics/gen/textureDimensions/e9fe58.wgsl
deleted file mode 100644
index b57f94310d..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<r32uint, read>) -> vec2<i32>
-fn textureDimensions_e9fe58() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e9fe58();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e9fe58();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e9fe58();
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.hlsl
deleted file mode 100644
index f725de73aa..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_e9fe58() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_e9fe58();
-  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() {
-  textureDimensions_e9fe58();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_e9fe58();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.msl
deleted file mode 100644
index 6ce7ae31c5..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_e9fe58(texture2d_array<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureDimensions_e9fe58(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_e9fe58(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_e9fe58(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.spvasm
deleted file mode 100644
index e8f098b36e..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_e9fe58 "textureDimensions_e9fe58"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %25 = OpConstantNull %v2int
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_e9fe58 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %25
-         %22 = OpLoad %11 %arg_0
-         %20 = OpImageQuerySize %v3int %22
-         %17 = OpVectorShuffle %v2int %20 %20 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureDimensions_e9fe58
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_e9fe58
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureDimensions_e9fe58
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.wgsl
deleted file mode 100644
index a3b5d179d7..0000000000
--- a/test/intrinsics/gen/textureDimensions/e9fe58.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32uint, read>;
-
-fn textureDimensions_e9fe58() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_e9fe58();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_e9fe58();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_e9fe58();
-}
diff --git a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl b/test/intrinsics/gen/textureDimensions/f1b72b.wgsl
deleted file mode 100644
index 1916d54191..0000000000
--- a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba32float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rgba32float, read>) -> vec2<i32>
-fn textureDimensions_f1b72b() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_f1b72b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_f1b72b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_f1b72b();
-}
diff --git a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.hlsl
deleted file mode 100644
index 5fe058b299..0000000000
--- a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_f1b72b() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_f1b72b();
-  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() {
-  textureDimensions_f1b72b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_f1b72b();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.msl
deleted file mode 100644
index 2ad9f9738e..0000000000
--- a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_f1b72b(texture2d<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureDimensions_f1b72b(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_f1b72b(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_f1b72b(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.spvasm
deleted file mode 100644
index e02181ce22..0000000000
--- a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,76 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_f1b72b "textureDimensions_f1b72b"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_f1b72b = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v2int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_f1b72b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_f1b72b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_f1b72b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.wgsl
deleted file mode 100644
index ec9af0434e..0000000000
--- a/test/intrinsics/gen/textureDimensions/f1b72b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba32float, read>;
-
-fn textureDimensions_f1b72b() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_f1b72b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_f1b72b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_f1b72b();
-}
diff --git a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl b/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl
deleted file mode 100644
index bdd61f7633..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8sint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba8sint, read>) -> vec2<i32>
-fn textureDimensions_f7aa9e() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_f7aa9e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_f7aa9e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_f7aa9e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.hlsl
deleted file mode 100644
index e29bca5e87..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureDimensions_f7aa9e() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_f7aa9e();
-  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() {
-  textureDimensions_f7aa9e();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_f7aa9e();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.msl
deleted file mode 100644
index 787e04dd12..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_f7aa9e(texture2d_array<int, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureDimensions_f7aa9e(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_f7aa9e(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_f7aa9e(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.spvasm
deleted file mode 100644
index 83a9263645..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_f7aa9e "textureDimensions_f7aa9e"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %24 = OpConstantNull %v2int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_f7aa9e = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpVectorShuffle %v2int %19 %19 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureDimensions_f7aa9e
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureDimensions_f7aa9e
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureDimensions_f7aa9e
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.wgsl
deleted file mode 100644
index f197e1fe69..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7aa9e.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8sint, read>;
-
-fn textureDimensions_f7aa9e() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_f7aa9e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_f7aa9e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_f7aa9e();
-}
diff --git a/test/intrinsics/gen/textureDimensions/f7e436.wgsl b/test/intrinsics/gen/textureDimensions/f7e436.wgsl
deleted file mode 100644
index 3956eaa085..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7e436.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8uint, read>;
-
-// fn textureDimensions(texture: texture_storage_2d_array<rgba8uint, read>) -> vec2<i32>
-fn textureDimensions_f7e436() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_f7e436();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_f7e436();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_f7e436();
-}
diff --git a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.hlsl
deleted file mode 100644
index 33b543887f..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_f7e436() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int2 res = tint_tmp.xy;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_f7e436();
-  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() {
-  textureDimensions_f7e436();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_f7e436();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.msl
deleted file mode 100644
index 74a83238d6..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_f7e436(texture2d_array<uint, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureDimensions_f7e436(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_f7e436(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_f7e436(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.spvasm
deleted file mode 100644
index d567410a3b..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_f7e436 "textureDimensions_f7e436"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %25 = OpConstantNull %v2int
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_f7e436 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %25
-         %22 = OpLoad %11 %arg_0
-         %20 = OpImageQuerySize %v3int %22
-         %17 = OpVectorShuffle %v2int %20 %20 0 1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureDimensions_f7e436
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_f7e436
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureDimensions_f7e436
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.wgsl
deleted file mode 100644
index ae022af685..0000000000
--- a/test/intrinsics/gen/textureDimensions/f7e436.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8uint, read>;
-
-fn textureDimensions_f7e436() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_f7e436();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_f7e436();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_f7e436();
-}
diff --git a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl b/test/intrinsics/gen/textureDimensions/fa90e1.wgsl
deleted file mode 100644
index 3503ca6033..0000000000
--- a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rg32float, read>;
-
-// fn textureDimensions(texture: texture_storage_2d<rg32float, read>) -> vec2<i32>
-fn textureDimensions_fa90e1() {
-  var res: vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_fa90e1();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_fa90e1();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_fa90e1();
-}
diff --git a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.hlsl
deleted file mode 100644
index aa72d3401b..0000000000
--- a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureDimensions_fa90e1() {
-  int2 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y);
-  int2 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_fa90e1();
-  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() {
-  textureDimensions_fa90e1();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_fa90e1();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.msl
deleted file mode 100644
index 91ab262bc0..0000000000
--- a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_fa90e1(texture2d<float, access::read> tint_symbol_1) {
-  int2 res = int2(tint_symbol_1.get_width(), tint_symbol_1.get_height());
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureDimensions_fa90e1(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_fa90e1(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_fa90e1(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.spvasm
deleted file mode 100644
index 76b12dee27..0000000000
--- a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_fa90e1 "textureDimensions_fa90e1"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-         %22 = OpConstantNull %v2int
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_fa90e1 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v2int Function %22
-         %19 = OpLoad %11 %arg_0
-         %16 = OpImageQuerySize %v2int %19
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureDimensions_fa90e1
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureDimensions_fa90e1
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureDimensions_fa90e1
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.wgsl
deleted file mode 100644
index 0a064498d2..0000000000
--- a/test/intrinsics/gen/textureDimensions/fa90e1.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rg32float, read>;
-
-fn textureDimensions_fa90e1() {
-  var res : vec2<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_fa90e1();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_fa90e1();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_fa90e1();
-}
diff --git a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl b/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl
deleted file mode 100644
index a543b983af..0000000000
--- a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<r32uint, read>;
-
-// fn textureDimensions(texture: texture_storage_3d<r32uint, read>) -> vec3<i32>
-fn textureDimensions_fbbe4d() {
-  var res: vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_fbbe4d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_fbbe4d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_fbbe4d();
-}
diff --git a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.hlsl b/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.hlsl
deleted file mode 100644
index 8613777bfc..0000000000
--- a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureDimensions_fbbe4d() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int3 res = tint_tmp;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureDimensions_fbbe4d();
-  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() {
-  textureDimensions_fbbe4d();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureDimensions_fbbe4d();
-  return;
-}
diff --git a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.msl b/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.msl
deleted file mode 100644
index aab3224bf0..0000000000
--- a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureDimensions_fbbe4d(texture3d<uint, access::read> tint_symbol_1) {
-  int3 res = int3(tint_symbol_1.get_width(), tint_symbol_1.get_height(), tint_symbol_1.get_depth());
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureDimensions_fbbe4d(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureDimensions_fbbe4d(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureDimensions_fbbe4d(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.spvasm b/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.spvasm
deleted file mode 100644
index b6f35d1271..0000000000
--- a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureDimensions_fbbe4d "textureDimensions_fbbe4d"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-         %23 = OpConstantNull %v3int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureDimensions_fbbe4d = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v3int Function %23
-         %20 = OpLoad %11 %arg_0
-         %17 = OpImageQuerySize %v3int %20
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureDimensions_fbbe4d
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureDimensions_fbbe4d
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureDimensions_fbbe4d
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.wgsl
deleted file mode 100644
index 5e864ac490..0000000000
--- a/test/intrinsics/gen/textureDimensions/fbbe4d.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<r32uint, read>;
-
-fn textureDimensions_fbbe4d() {
-  var res : vec3<i32> = textureDimensions(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureDimensions_fbbe4d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureDimensions_fbbe4d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureDimensions_fbbe4d();
-}
diff --git a/test/intrinsics/gen/textureLoad/050c33.wgsl b/test/intrinsics/gen/textureLoad/050c33.wgsl
deleted file mode 100644
index d1d5b768fd..0000000000
--- a/test/intrinsics/gen/textureLoad/050c33.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rg32uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rg32uint, read>, coords: vec2<i32>) -> vec4<u32>
-fn textureLoad_050c33() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_050c33();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_050c33();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_050c33();
-}
diff --git a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.hlsl
deleted file mode 100644
index 4a48d6dee2..0000000000
--- a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/050c33.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_050c33() {
-  uint4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_050c33();
-  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() {
-  textureLoad_050c33();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_050c33();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.msl
deleted file mode 100644
index 1708a46ef4..0000000000
--- a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/050c33.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_050c33(texture2d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureLoad_050c33(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_050c33(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_050c33(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.spvasm
deleted file mode 100644
index b07a3c58e8..0000000000
--- a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-intrinsics/gen/textureLoad/050c33.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_050c33 "textureLoad_050c33"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %22 = OpConstantNull %v2int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_050c33 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_050c33
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_050c33
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_050c33
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.wgsl
deleted file mode 100644
index 32fac79d91..0000000000
--- a/test/intrinsics/gen/textureLoad/050c33.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/050c33.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rg32uint, read>;
-
-fn textureLoad_050c33() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_050c33();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_050c33();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_050c33();
-}
diff --git a/test/intrinsics/gen/textureLoad/072e26.wgsl b/test/intrinsics/gen/textureLoad/072e26.wgsl
deleted file mode 100644
index 9e944151e8..0000000000
--- a/test/intrinsics/gen/textureLoad/072e26.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8snorm, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba8snorm, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32>
-fn textureLoad_072e26() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_072e26();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_072e26();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_072e26();
-}
diff --git a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.hlsl
deleted file mode 100644
index b68a7f57b4..0000000000
--- a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/072e26.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureLoad_072e26() {
-  float4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_072e26();
-  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() {
-  textureLoad_072e26();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_072e26();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.msl
deleted file mode 100644
index b3ad18fcde..0000000000
--- a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/072e26.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_072e26(texture2d_array<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureLoad_072e26(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_072e26(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_072e26(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.spvasm
deleted file mode 100644
index baf53a401c..0000000000
--- a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/072e26.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_072e26 "textureLoad_072e26"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %22 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_072e26 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %22
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_072e26
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_072e26
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_072e26
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.wgsl
deleted file mode 100644
index 15cd3cdce2..0000000000
--- a/test/intrinsics/gen/textureLoad/072e26.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/072e26.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8snorm, read>;
-
-fn textureLoad_072e26() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_072e26();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_072e26();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_072e26();
-}
diff --git a/test/intrinsics/gen/textureLoad/078bc4.wgsl b/test/intrinsics/gen/textureLoad/078bc4.wgsl
deleted file mode 100644
index 0a9eaa3973..0000000000
--- a/test/intrinsics/gen/textureLoad/078bc4.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8snorm, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba8snorm, read>, coords: vec2<i32>) -> vec4<f32>
-fn textureLoad_078bc4() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_078bc4();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_078bc4();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_078bc4();
-}
diff --git a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.hlsl
deleted file mode 100644
index 8e30c790fa..0000000000
--- a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/078bc4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_078bc4() {
-  float4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_078bc4();
-  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() {
-  textureLoad_078bc4();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_078bc4();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.msl
deleted file mode 100644
index 634a459dfb..0000000000
--- a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/078bc4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_078bc4(texture2d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureLoad_078bc4(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_078bc4(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_078bc4(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.spvasm
deleted file mode 100644
index 06825de9f6..0000000000
--- a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/078bc4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_078bc4 "textureLoad_078bc4"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %20 = OpConstantNull %v2int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_078bc4 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_078bc4
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_078bc4
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_078bc4
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.wgsl
deleted file mode 100644
index a6e01ac984..0000000000
--- a/test/intrinsics/gen/textureLoad/078bc4.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/078bc4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8snorm, read>;
-
-fn textureLoad_078bc4() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_078bc4();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_078bc4();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_078bc4();
-}
diff --git a/test/intrinsics/gen/textureLoad/127e12.wgsl b/test/intrinsics/gen/textureLoad/127e12.wgsl
deleted file mode 100644
index fff28a57ea..0000000000
--- a/test/intrinsics/gen/textureLoad/127e12.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba16uint, read>, coords: vec2<i32>, array_index: i32) -> vec4<u32>
-fn textureLoad_127e12() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_127e12();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_127e12();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_127e12();
-}
diff --git a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.hlsl
deleted file mode 100644
index 4bf4489362..0000000000
--- a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/127e12.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_127e12() {
-  uint4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_127e12();
-  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() {
-  textureLoad_127e12();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_127e12();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.msl
deleted file mode 100644
index f0514c1353..0000000000
--- a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/127e12.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_127e12(texture2d_array<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureLoad_127e12(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_127e12(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_127e12(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.spvasm
deleted file mode 100644
index 2e74406898..0000000000
--- a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.spvasm
+++ /dev/null
@@ -1,84 +0,0 @@
-intrinsics/gen/textureLoad/127e12.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 42
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_127e12 "textureLoad_127e12"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %24 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %27 = OpConstantNull %v4uint
-         %28 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_127e12 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %27
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %24
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %28
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %textureLoad_127e12
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %34
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_127e12
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %40 = OpLabel
-         %41 = OpFunctionCall %void %textureLoad_127e12
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.wgsl
deleted file mode 100644
index f159f7d343..0000000000
--- a/test/intrinsics/gen/textureLoad/127e12.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/127e12.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16uint, read>;
-
-fn textureLoad_127e12() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_127e12();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_127e12();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_127e12();
-}
diff --git a/test/intrinsics/gen/textureLoad/1561a7.wgsl b/test/intrinsics/gen/textureLoad/1561a7.wgsl
deleted file mode 100644
index 7234367f57..0000000000
--- a/test/intrinsics/gen/textureLoad/1561a7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<r32uint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<r32uint, read>, coords: i32) -> vec4<u32>
-fn textureLoad_1561a7() {
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_1561a7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_1561a7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_1561a7();
-}
diff --git a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.hlsl
deleted file mode 100644
index 9cbe429b29..0000000000
--- a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/1561a7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_1561a7() {
-  uint4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_1561a7();
-  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() {
-  textureLoad_1561a7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_1561a7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.msl
deleted file mode 100644
index 84e22457e5..0000000000
--- a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/1561a7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_1561a7(texture1d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureLoad_1561a7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_1561a7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_1561a7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.spvasm
deleted file mode 100644
index f2908b8583..0000000000
--- a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/1561a7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_1561a7 "textureLoad_1561a7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %24 = OpConstantNull %v4uint
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_1561a7 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_1561a7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_1561a7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_1561a7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.wgsl
deleted file mode 100644
index 0341305fa5..0000000000
--- a/test/intrinsics/gen/textureLoad/1561a7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/1561a7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<r32uint, read>;
-
-fn textureLoad_1561a7() {
-  var res : vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_1561a7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_1561a7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_1561a7();
-}
diff --git a/test/intrinsics/gen/textureLoad/1a062f.wgsl b/test/intrinsics/gen/textureLoad/1a062f.wgsl
deleted file mode 100644
index e72fd7a505..0000000000
--- a/test/intrinsics/gen/textureLoad/1a062f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16float, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba16float, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32>
-fn textureLoad_1a062f() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_1a062f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_1a062f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_1a062f();
-}
diff --git a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.hlsl
deleted file mode 100644
index fc10480877..0000000000
--- a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/1a062f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureLoad_1a062f() {
-  float4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_1a062f();
-  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() {
-  textureLoad_1a062f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_1a062f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.msl
deleted file mode 100644
index 20bcf883d2..0000000000
--- a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/1a062f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_1a062f(texture2d_array<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureLoad_1a062f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_1a062f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_1a062f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.spvasm
deleted file mode 100644
index e86a28f1d8..0000000000
--- a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/1a062f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_1a062f "textureLoad_1a062f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %22 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_1a062f = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %22
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_1a062f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_1a062f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_1a062f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.wgsl
deleted file mode 100644
index 59cf4d513c..0000000000
--- a/test/intrinsics/gen/textureLoad/1a062f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/1a062f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16float, read>;
-
-fn textureLoad_1a062f() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_1a062f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_1a062f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_1a062f();
-}
diff --git a/test/intrinsics/gen/textureLoad/1a8452.wgsl b/test/intrinsics/gen/textureLoad/1a8452.wgsl
deleted file mode 100644
index cf994011ff..0000000000
--- a/test/intrinsics/gen/textureLoad/1a8452.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8uint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba8uint, read>, coords: i32) -> vec4<u32>
-fn textureLoad_1a8452() {
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_1a8452();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_1a8452();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_1a8452();
-}
diff --git a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.hlsl
deleted file mode 100644
index 16a4b1cc58..0000000000
--- a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/1a8452.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_1a8452() {
-  uint4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_1a8452();
-  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() {
-  textureLoad_1a8452();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_1a8452();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.msl
deleted file mode 100644
index 49f79b67b7..0000000000
--- a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/1a8452.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_1a8452(texture1d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureLoad_1a8452(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_1a8452(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_1a8452(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.spvasm
deleted file mode 100644
index 11b914ff6a..0000000000
--- a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/1a8452.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_1a8452 "textureLoad_1a8452"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %24 = OpConstantNull %v4uint
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_1a8452 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_1a8452
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_1a8452
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_1a8452
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.wgsl
deleted file mode 100644
index 5c7fe9f521..0000000000
--- a/test/intrinsics/gen/textureLoad/1a8452.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/1a8452.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8uint, read>;
-
-fn textureLoad_1a8452() {
-  var res : vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_1a8452();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_1a8452();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_1a8452();
-}
diff --git a/test/intrinsics/gen/textureLoad/20fa2f.wgsl b/test/intrinsics/gen/textureLoad/20fa2f.wgsl
deleted file mode 100644
index a3522ba30f..0000000000
--- a/test/intrinsics/gen/textureLoad/20fa2f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32float, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rg32float, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32>
-fn textureLoad_20fa2f() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_20fa2f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_20fa2f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_20fa2f();
-}
diff --git a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.hlsl
deleted file mode 100644
index 8943506de7..0000000000
--- a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/20fa2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureLoad_20fa2f() {
-  float4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_20fa2f();
-  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() {
-  textureLoad_20fa2f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_20fa2f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.msl
deleted file mode 100644
index 3b66ea4299..0000000000
--- a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/20fa2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_20fa2f(texture2d_array<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureLoad_20fa2f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_20fa2f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_20fa2f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.spvasm
deleted file mode 100644
index 43dd7650c1..0000000000
--- a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/20fa2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_20fa2f "textureLoad_20fa2f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %22 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_20fa2f = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %22
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_20fa2f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_20fa2f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_20fa2f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.wgsl
deleted file mode 100644
index 92618a32bb..0000000000
--- a/test/intrinsics/gen/textureLoad/20fa2f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/20fa2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32float, read>;
-
-fn textureLoad_20fa2f() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_20fa2f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_20fa2f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_20fa2f();
-}
diff --git a/test/intrinsics/gen/textureLoad/276a2c.wgsl b/test/intrinsics/gen/textureLoad/276a2c.wgsl
deleted file mode 100644
index a41fd0e008..0000000000
--- a/test/intrinsics/gen/textureLoad/276a2c.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba32uint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba32uint, read>, coords: i32) -> vec4<u32>
-fn textureLoad_276a2c() {
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_276a2c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_276a2c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_276a2c();
-}
diff --git a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.hlsl
deleted file mode 100644
index cef1b28dc4..0000000000
--- a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/276a2c.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_276a2c() {
-  uint4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_276a2c();
-  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() {
-  textureLoad_276a2c();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_276a2c();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.msl
deleted file mode 100644
index 16bddfa9d8..0000000000
--- a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/276a2c.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_276a2c(texture1d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureLoad_276a2c(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_276a2c(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_276a2c(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.spvasm
deleted file mode 100644
index 6217b54c9e..0000000000
--- a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/276a2c.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_276a2c "textureLoad_276a2c"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %24 = OpConstantNull %v4uint
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_276a2c = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_276a2c
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_276a2c
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_276a2c
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.wgsl
deleted file mode 100644
index b196ddff84..0000000000
--- a/test/intrinsics/gen/textureLoad/276a2c.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/276a2c.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba32uint, read>;
-
-fn textureLoad_276a2c() {
-  var res : vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_276a2c();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_276a2c();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_276a2c();
-}
diff --git a/test/intrinsics/gen/textureLoad/2887d7.wgsl b/test/intrinsics/gen/textureLoad/2887d7.wgsl
deleted file mode 100644
index 2a4d504f68..0000000000
--- a/test/intrinsics/gen/textureLoad/2887d7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba32float, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba32float, read>, coords: i32) -> vec4<f32>
-fn textureLoad_2887d7() {
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_2887d7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_2887d7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_2887d7();
-}
diff --git a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.hlsl
deleted file mode 100644
index 490111559b..0000000000
--- a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/2887d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_2887d7() {
-  float4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_2887d7();
-  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() {
-  textureLoad_2887d7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_2887d7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.msl
deleted file mode 100644
index c012feb5d5..0000000000
--- a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/2887d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_2887d7(texture1d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureLoad_2887d7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_2887d7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_2887d7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.spvasm
deleted file mode 100644
index b606ca1097..0000000000
--- a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/2887d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_2887d7 "textureLoad_2887d7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_2887d7 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %int_1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureLoad_2887d7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureLoad_2887d7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_2887d7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.wgsl
deleted file mode 100644
index 53f0baf859..0000000000
--- a/test/intrinsics/gen/textureLoad/2887d7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/2887d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba32float, read>;
-
-fn textureLoad_2887d7() {
-  var res : vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_2887d7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_2887d7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_2887d7();
-}
diff --git a/test/intrinsics/gen/textureLoad/2ae485.wgsl b/test/intrinsics/gen/textureLoad/2ae485.wgsl
deleted file mode 100644
index 45cf90c44d..0000000000
--- a/test/intrinsics/gen/textureLoad/2ae485.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba16sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba16sint, read>, coords: vec2<i32>) -> vec4<i32>
-fn textureLoad_2ae485() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_2ae485();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_2ae485();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_2ae485();
-}
diff --git a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.hlsl
deleted file mode 100644
index 33a5d4da5a..0000000000
--- a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/2ae485.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_2ae485() {
-  int4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_2ae485();
-  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() {
-  textureLoad_2ae485();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_2ae485();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.msl
deleted file mode 100644
index 183e7a9c56..0000000000
--- a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/2ae485.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_2ae485(texture2d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureLoad_2ae485(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_2ae485(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_2ae485(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.spvasm
deleted file mode 100644
index b87c6edd8e..0000000000
--- a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/2ae485.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_2ae485 "textureLoad_2ae485"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v2int = OpTypeVector %int 2
-         %21 = OpConstantNull %v2int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_2ae485 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_2ae485
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_2ae485
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_2ae485
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.wgsl
deleted file mode 100644
index 16acaac794..0000000000
--- a/test/intrinsics/gen/textureLoad/2ae485.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/2ae485.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba16sint, read>;
-
-fn textureLoad_2ae485() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_2ae485();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_2ae485();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_2ae485();
-}
diff --git a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl b/test/intrinsics/gen/textureLoad/2d6cf7.wgsl
deleted file mode 100644
index 8ace1b2a6b..0000000000
--- a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rg32sint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rg32sint, read>, coords: i32) -> vec4<i32>
-fn textureLoad_2d6cf7() {
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_2d6cf7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_2d6cf7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_2d6cf7();
-}
diff --git a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.hlsl
deleted file mode 100644
index 5205c0134d..0000000000
--- a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/2d6cf7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_2d6cf7() {
-  int4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_2d6cf7();
-  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() {
-  textureLoad_2d6cf7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_2d6cf7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.msl
deleted file mode 100644
index e721286fb7..0000000000
--- a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/2d6cf7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_2d6cf7(texture1d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureLoad_2d6cf7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_2d6cf7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_2d6cf7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.spvasm
deleted file mode 100644
index bb1b5664f6..0000000000
--- a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/2d6cf7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_2d6cf7 "textureLoad_2d6cf7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %23 = OpConstantNull %v4int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_2d6cf7 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %23
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureLoad_2d6cf7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureLoad_2d6cf7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_2d6cf7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.wgsl
deleted file mode 100644
index bf61471820..0000000000
--- a/test/intrinsics/gen/textureLoad/2d6cf7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/2d6cf7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rg32sint, read>;
-
-fn textureLoad_2d6cf7() {
-  var res : vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_2d6cf7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_2d6cf7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_2d6cf7();
-}
diff --git a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl b/test/intrinsics/gen/textureLoad/3c0d9e.wgsl
deleted file mode 100644
index debeed42f5..0000000000
--- a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba8uint, read>, coords: vec2<i32>) -> vec4<u32>
-fn textureLoad_3c0d9e() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3c0d9e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3c0d9e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3c0d9e();
-}
diff --git a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.hlsl
deleted file mode 100644
index f374510704..0000000000
--- a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/3c0d9e.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_3c0d9e() {
-  uint4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_3c0d9e();
-  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() {
-  textureLoad_3c0d9e();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_3c0d9e();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.msl
deleted file mode 100644
index 62514f8059..0000000000
--- a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/3c0d9e.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_3c0d9e(texture2d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureLoad_3c0d9e(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_3c0d9e(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_3c0d9e(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.spvasm
deleted file mode 100644
index 9788afc845..0000000000
--- a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/3c0d9e.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_3c0d9e "textureLoad_3c0d9e"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %22 = OpConstantNull %v2int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_3c0d9e = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_3c0d9e
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_3c0d9e
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_3c0d9e
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.wgsl
deleted file mode 100644
index 5863d7105a..0000000000
--- a/test/intrinsics/gen/textureLoad/3c0d9e.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/3c0d9e.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8uint, read>;
-
-fn textureLoad_3c0d9e() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3c0d9e();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3c0d9e();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3c0d9e();
-}
diff --git a/test/intrinsics/gen/textureLoad/3c9587.wgsl b/test/intrinsics/gen/textureLoad/3c9587.wgsl
deleted file mode 100644
index 2d5b352cce..0000000000
--- a/test/intrinsics/gen/textureLoad/3c9587.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8unorm, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba8unorm, read>, coords: vec2<i32>) -> vec4<f32>
-fn textureLoad_3c9587() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3c9587();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3c9587();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3c9587();
-}
diff --git a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.hlsl
deleted file mode 100644
index b4c57c56e7..0000000000
--- a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/3c9587.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_3c9587() {
-  float4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_3c9587();
-  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() {
-  textureLoad_3c9587();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_3c9587();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.msl
deleted file mode 100644
index 6ed1a44d63..0000000000
--- a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/3c9587.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_3c9587(texture2d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureLoad_3c9587(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_3c9587(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_3c9587(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.spvasm
deleted file mode 100644
index 646e40373f..0000000000
--- a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/3c9587.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_3c9587 "textureLoad_3c9587"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %20 = OpConstantNull %v2int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_3c9587 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_3c9587
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_3c9587
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_3c9587
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.wgsl
deleted file mode 100644
index 3e0a4d2765..0000000000
--- a/test/intrinsics/gen/textureLoad/3c9587.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/3c9587.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8unorm, read>;
-
-fn textureLoad_3c9587() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3c9587();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3c9587();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3c9587();
-}
diff --git a/test/intrinsics/gen/textureLoad/3d001b.wgsl b/test/intrinsics/gen/textureLoad/3d001b.wgsl
deleted file mode 100644
index 9d7d500bff..0000000000
--- a/test/intrinsics/gen/textureLoad/3d001b.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8sint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba8sint, read>, coords: vec3<i32>) -> vec4<i32>
-fn textureLoad_3d001b() {
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3d001b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3d001b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3d001b();
-}
diff --git a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.hlsl
deleted file mode 100644
index b096fa0795..0000000000
--- a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/3d001b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_3d001b() {
-  int4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_3d001b();
-  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() {
-  textureLoad_3d001b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_3d001b();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.msl
deleted file mode 100644
index dba9fa6e22..0000000000
--- a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/3d001b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_3d001b(texture3d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureLoad_3d001b(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_3d001b(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_3d001b(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.spvasm
deleted file mode 100644
index e8bc1b2fcc..0000000000
--- a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/3d001b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_3d001b "textureLoad_3d001b"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-         %21 = OpConstantNull %v3int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_3d001b = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_3d001b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_3d001b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_3d001b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.wgsl
deleted file mode 100644
index 48e651a313..0000000000
--- a/test/intrinsics/gen/textureLoad/3d001b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/3d001b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8sint, read>;
-
-fn textureLoad_3d001b() {
-  var res : vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3d001b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3d001b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3d001b();
-}
diff --git a/test/intrinsics/gen/textureLoad/3d9c90.wgsl b/test/intrinsics/gen/textureLoad/3d9c90.wgsl
deleted file mode 100644
index b8db884053..0000000000
--- a/test/intrinsics/gen/textureLoad/3d9c90.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba32float, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba32float, read>, coords: vec3<i32>) -> vec4<f32>
-fn textureLoad_3d9c90() {
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3d9c90();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3d9c90();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3d9c90();
-}
diff --git a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.hlsl
deleted file mode 100644
index 0ab66c2071..0000000000
--- a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/3d9c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_3d9c90() {
-  float4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_3d9c90();
-  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() {
-  textureLoad_3d9c90();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_3d9c90();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.msl
deleted file mode 100644
index efb0420671..0000000000
--- a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/3d9c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_3d9c90(texture3d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureLoad_3d9c90(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_3d9c90(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_3d9c90(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.spvasm
deleted file mode 100644
index daaf0e4a99..0000000000
--- a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/3d9c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_3d9c90 "textureLoad_3d9c90"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %20 = OpConstantNull %v3int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_3d9c90 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_3d9c90
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_3d9c90
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_3d9c90
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.wgsl
deleted file mode 100644
index a958e3c85f..0000000000
--- a/test/intrinsics/gen/textureLoad/3d9c90.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/3d9c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba32float, read>;
-
-fn textureLoad_3d9c90() {
-  var res : vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_3d9c90();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_3d9c90();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_3d9c90();
-}
diff --git a/test/intrinsics/gen/textureLoad/505aa2.wgsl b/test/intrinsics/gen/textureLoad/505aa2.wgsl
deleted file mode 100644
index 59944d79ab..0000000000
--- a/test/intrinsics/gen/textureLoad/505aa2.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<r32sint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<r32sint, read>, coords: vec3<i32>) -> vec4<i32>
-fn textureLoad_505aa2() {
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_505aa2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_505aa2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_505aa2();
-}
diff --git a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.hlsl
deleted file mode 100644
index 897582bd88..0000000000
--- a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/505aa2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_505aa2() {
-  int4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_505aa2();
-  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() {
-  textureLoad_505aa2();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_505aa2();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.msl
deleted file mode 100644
index c62f8e4907..0000000000
--- a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/505aa2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_505aa2(texture3d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureLoad_505aa2(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_505aa2(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_505aa2(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.spvasm
deleted file mode 100644
index df71fff028..0000000000
--- a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/505aa2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_505aa2 "textureLoad_505aa2"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-         %21 = OpConstantNull %v3int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_505aa2 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_505aa2
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_505aa2
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_505aa2
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.wgsl
deleted file mode 100644
index 76944c37c6..0000000000
--- a/test/intrinsics/gen/textureLoad/505aa2.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/505aa2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<r32sint, read>;
-
-fn textureLoad_505aa2() {
-  var res : vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_505aa2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_505aa2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_505aa2();
-}
diff --git a/test/intrinsics/gen/textureLoad/519ab5.wgsl b/test/intrinsics/gen/textureLoad/519ab5.wgsl
deleted file mode 100644
index 109368b643..0000000000
--- a/test/intrinsics/gen/textureLoad/519ab5.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8unorm, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba8unorm, read>, coords: i32) -> vec4<f32>
-fn textureLoad_519ab5() {
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_519ab5();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_519ab5();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_519ab5();
-}
diff --git a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.hlsl
deleted file mode 100644
index 01f1d4d3fe..0000000000
--- a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/519ab5.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_519ab5() {
-  float4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_519ab5();
-  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() {
-  textureLoad_519ab5();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_519ab5();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.msl
deleted file mode 100644
index 549ef6e63e..0000000000
--- a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/519ab5.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_519ab5(texture1d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureLoad_519ab5(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_519ab5(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_519ab5(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.spvasm
deleted file mode 100644
index 71ec10dbe2..0000000000
--- a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/519ab5.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_519ab5 "textureLoad_519ab5"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_519ab5 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %int_1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureLoad_519ab5
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureLoad_519ab5
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_519ab5
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.wgsl
deleted file mode 100644
index 34eacd611f..0000000000
--- a/test/intrinsics/gen/textureLoad/519ab5.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/519ab5.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8unorm, read>;
-
-fn textureLoad_519ab5() {
-  var res : vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_519ab5();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_519ab5();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_519ab5();
-}
diff --git a/test/intrinsics/gen/textureLoad/53378a.wgsl b/test/intrinsics/gen/textureLoad/53378a.wgsl
deleted file mode 100644
index 02bb1b1022..0000000000
--- a/test/intrinsics/gen/textureLoad/53378a.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rg32sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rg32sint, read>, coords: vec2<i32>) -> vec4<i32>
-fn textureLoad_53378a() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_53378a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_53378a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_53378a();
-}
diff --git a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.hlsl
deleted file mode 100644
index c79ca0fe45..0000000000
--- a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/53378a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_53378a() {
-  int4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_53378a();
-  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() {
-  textureLoad_53378a();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_53378a();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.msl
deleted file mode 100644
index 05499809e2..0000000000
--- a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/53378a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_53378a(texture2d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureLoad_53378a(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_53378a(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_53378a(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.spvasm
deleted file mode 100644
index 116f265e3c..0000000000
--- a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/53378a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_53378a "textureLoad_53378a"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v2int = OpTypeVector %int 2
-         %21 = OpConstantNull %v2int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_53378a = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_53378a
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_53378a
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_53378a
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.wgsl
deleted file mode 100644
index cc148b113c..0000000000
--- a/test/intrinsics/gen/textureLoad/53378a.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/53378a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rg32sint, read>;
-
-fn textureLoad_53378a() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_53378a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_53378a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_53378a();
-}
diff --git a/test/intrinsics/gen/textureLoad/560573.wgsl b/test/intrinsics/gen/textureLoad/560573.wgsl
deleted file mode 100644
index a239822782..0000000000
--- a/test/intrinsics/gen/textureLoad/560573.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<r32sint, read>, coords: vec2<i32>, array_index: i32) -> vec4<i32>
-fn textureLoad_560573() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_560573();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_560573();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_560573();
-}
diff --git a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/560573.wgsl.expected.hlsl
deleted file mode 100644
index 54b726d83b..0000000000
--- a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/560573.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureLoad_560573() {
-  int4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_560573();
-  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() {
-  textureLoad_560573();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_560573();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/560573.wgsl.expected.msl
deleted file mode 100644
index fa40b9f176..0000000000
--- a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/560573.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_560573(texture2d_array<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureLoad_560573(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_560573(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_560573(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/560573.wgsl.expected.spvasm
deleted file mode 100644
index c0e8c7c0b5..0000000000
--- a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-intrinsics/gen/textureLoad/560573.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 41
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_560573 "textureLoad_560573"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %23 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %26 = OpConstantNull %v4int
-         %27 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_560573 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %26
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %23
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %27
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %textureLoad_560573
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %33
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_560573
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %39 = OpLabel
-         %40 = OpFunctionCall %void %textureLoad_560573
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/560573.wgsl.expected.wgsl
deleted file mode 100644
index dca8c0f677..0000000000
--- a/test/intrinsics/gen/textureLoad/560573.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/560573.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32sint, read>;
-
-fn textureLoad_560573() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_560573();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_560573();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_560573();
-}
diff --git a/test/intrinsics/gen/textureLoad/582015.wgsl b/test/intrinsics/gen/textureLoad/582015.wgsl
deleted file mode 100644
index aff39de275..0000000000
--- a/test/intrinsics/gen/textureLoad/582015.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba8sint, read>, coords: vec2<i32>, array_index: i32) -> vec4<i32>
-fn textureLoad_582015() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_582015();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_582015();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_582015();
-}
diff --git a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/582015.wgsl.expected.hlsl
deleted file mode 100644
index 7060970b02..0000000000
--- a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/582015.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureLoad_582015() {
-  int4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_582015();
-  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() {
-  textureLoad_582015();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_582015();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/582015.wgsl.expected.msl
deleted file mode 100644
index a2bb31ac63..0000000000
--- a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/582015.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_582015(texture2d_array<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureLoad_582015(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_582015(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_582015(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/582015.wgsl.expected.spvasm
deleted file mode 100644
index f3536aec4c..0000000000
--- a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-intrinsics/gen/textureLoad/582015.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 41
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_582015 "textureLoad_582015"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %23 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %26 = OpConstantNull %v4int
-         %27 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_582015 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %26
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %23
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %27
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %textureLoad_582015
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %33
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_582015
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %39 = OpLabel
-         %40 = OpFunctionCall %void %textureLoad_582015
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/582015.wgsl.expected.wgsl
deleted file mode 100644
index aca284fbc8..0000000000
--- a/test/intrinsics/gen/textureLoad/582015.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/582015.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8sint, read>;
-
-fn textureLoad_582015() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_582015();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_582015();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_582015();
-}
diff --git a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl b/test/intrinsics/gen/textureLoad/5bb7fb.wgsl
deleted file mode 100644
index 0b48f68dcb..0000000000
--- a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rg32uint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rg32uint, read>, coords: i32) -> vec4<u32>
-fn textureLoad_5bb7fb() {
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_5bb7fb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_5bb7fb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_5bb7fb();
-}
diff --git a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.hlsl
deleted file mode 100644
index e3c6baabc5..0000000000
--- a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/5bb7fb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_5bb7fb() {
-  uint4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_5bb7fb();
-  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() {
-  textureLoad_5bb7fb();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_5bb7fb();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.msl
deleted file mode 100644
index 3a2bae4014..0000000000
--- a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/5bb7fb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_5bb7fb(texture1d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureLoad_5bb7fb(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_5bb7fb(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_5bb7fb(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.spvasm
deleted file mode 100644
index f6c5b95d99..0000000000
--- a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-intrinsics/gen/textureLoad/5bb7fb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_5bb7fb "textureLoad_5bb7fb"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %24 = OpConstantNull %v4uint
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_5bb7fb = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_5bb7fb
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_5bb7fb
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_5bb7fb
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.wgsl
deleted file mode 100644
index a36d3dc2bd..0000000000
--- a/test/intrinsics/gen/textureLoad/5bb7fb.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/5bb7fb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rg32uint, read>;
-
-fn textureLoad_5bb7fb() {
-  var res : vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_5bb7fb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_5bb7fb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_5bb7fb();
-}
diff --git a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl b/test/intrinsics/gen/textureLoad/5d0a2f.wgsl
deleted file mode 100644
index e94ebe5278..0000000000
--- a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<r32uint, read>, coords: vec2<i32>, array_index: i32) -> vec4<u32>
-fn textureLoad_5d0a2f() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_5d0a2f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_5d0a2f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_5d0a2f();
-}
diff --git a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.hlsl
deleted file mode 100644
index bb38fd74d7..0000000000
--- a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/5d0a2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_5d0a2f() {
-  uint4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_5d0a2f();
-  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() {
-  textureLoad_5d0a2f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_5d0a2f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.msl
deleted file mode 100644
index c2ea011e18..0000000000
--- a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/5d0a2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_5d0a2f(texture2d_array<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureLoad_5d0a2f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_5d0a2f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_5d0a2f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.spvasm
deleted file mode 100644
index 52772ea810..0000000000
--- a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,84 +0,0 @@
-intrinsics/gen/textureLoad/5d0a2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 42
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_5d0a2f "textureLoad_5d0a2f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %24 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %27 = OpConstantNull %v4uint
-         %28 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_5d0a2f = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %27
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %24
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %28
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %textureLoad_5d0a2f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %34
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_5d0a2f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %40 = OpLabel
-         %41 = OpFunctionCall %void %textureLoad_5d0a2f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.wgsl
deleted file mode 100644
index 515ec5d9f6..0000000000
--- a/test/intrinsics/gen/textureLoad/5d0a2f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/5d0a2f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32uint, read>;
-
-fn textureLoad_5d0a2f() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_5d0a2f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_5d0a2f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_5d0a2f();
-}
diff --git a/test/intrinsics/gen/textureLoad/62d125.wgsl b/test/intrinsics/gen/textureLoad/62d125.wgsl
deleted file mode 100644
index 83fb6df28a..0000000000
--- a/test/intrinsics/gen/textureLoad/62d125.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8snorm, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba8snorm, read>, coords: vec3<i32>) -> vec4<f32>
-fn textureLoad_62d125() {
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_62d125();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_62d125();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_62d125();
-}
diff --git a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.hlsl
deleted file mode 100644
index d48cc5bc96..0000000000
--- a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/62d125.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_62d125() {
-  float4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_62d125();
-  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() {
-  textureLoad_62d125();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_62d125();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.msl
deleted file mode 100644
index 5c858885e4..0000000000
--- a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/62d125.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_62d125(texture3d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureLoad_62d125(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_62d125(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_62d125(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.spvasm
deleted file mode 100644
index 55f6bd707f..0000000000
--- a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/62d125.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_62d125 "textureLoad_62d125"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %20 = OpConstantNull %v3int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_62d125 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_62d125
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_62d125
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_62d125
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.wgsl
deleted file mode 100644
index 75360773aa..0000000000
--- a/test/intrinsics/gen/textureLoad/62d125.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/62d125.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8snorm, read>;
-
-fn textureLoad_62d125() {
-  var res : vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_62d125();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_62d125();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_62d125();
-}
diff --git a/test/intrinsics/gen/textureLoad/6678b6.wgsl b/test/intrinsics/gen/textureLoad/6678b6.wgsl
deleted file mode 100644
index 367a45a250..0000000000
--- a/test/intrinsics/gen/textureLoad/6678b6.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba16sint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba16sint, read>, coords: i32) -> vec4<i32>
-fn textureLoad_6678b6() {
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_6678b6();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_6678b6();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_6678b6();
-}
diff --git a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.hlsl
deleted file mode 100644
index 233219685d..0000000000
--- a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/6678b6.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_6678b6() {
-  int4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_6678b6();
-  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() {
-  textureLoad_6678b6();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_6678b6();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.msl
deleted file mode 100644
index e2644f36ed..0000000000
--- a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/6678b6.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_6678b6(texture1d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureLoad_6678b6(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_6678b6(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_6678b6(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.spvasm
deleted file mode 100644
index fee02ecc83..0000000000
--- a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/6678b6.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_6678b6 "textureLoad_6678b6"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %23 = OpConstantNull %v4int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_6678b6 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %23
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureLoad_6678b6
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureLoad_6678b6
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_6678b6
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.wgsl
deleted file mode 100644
index 2b9036b2c3..0000000000
--- a/test/intrinsics/gen/textureLoad/6678b6.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/6678b6.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba16sint, read>;
-
-fn textureLoad_6678b6() {
-  var res : vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_6678b6();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_6678b6();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_6678b6();
-}
diff --git a/test/intrinsics/gen/textureLoad/67edca.wgsl b/test/intrinsics/gen/textureLoad/67edca.wgsl
deleted file mode 100644
index 49c60fc9ec..0000000000
--- a/test/intrinsics/gen/textureLoad/67edca.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba32uint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba32uint, read>, coords: vec3<i32>) -> vec4<u32>
-fn textureLoad_67edca() {
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_67edca();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_67edca();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_67edca();
-}
diff --git a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.hlsl
deleted file mode 100644
index 4571e927fa..0000000000
--- a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/67edca.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_67edca() {
-  uint4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_67edca();
-  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() {
-  textureLoad_67edca();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_67edca();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.msl
deleted file mode 100644
index 97fdf44624..0000000000
--- a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/67edca.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_67edca(texture3d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureLoad_67edca(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_67edca(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_67edca(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.spvasm
deleted file mode 100644
index 338c91b312..0000000000
--- a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/67edca.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_67edca "textureLoad_67edca"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %22 = OpConstantNull %v3int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_67edca = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_67edca
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_67edca
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_67edca
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.wgsl
deleted file mode 100644
index 1a1b06bf50..0000000000
--- a/test/intrinsics/gen/textureLoad/67edca.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/67edca.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba32uint, read>;
-
-fn textureLoad_67edca() {
-  var res : vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_67edca();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_67edca();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_67edca();
-}
diff --git a/test/intrinsics/gen/textureLoad/749704.wgsl b/test/intrinsics/gen/textureLoad/749704.wgsl
deleted file mode 100644
index 4320ba80ff..0000000000
--- a/test/intrinsics/gen/textureLoad/749704.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<r32uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<r32uint, read>, coords: vec2<i32>) -> vec4<u32>
-fn textureLoad_749704() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_749704();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_749704();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_749704();
-}
diff --git a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/749704.wgsl.expected.hlsl
deleted file mode 100644
index 046682ef72..0000000000
--- a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/749704.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_749704() {
-  uint4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_749704();
-  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() {
-  textureLoad_749704();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_749704();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/749704.wgsl.expected.msl
deleted file mode 100644
index 5321c14ac6..0000000000
--- a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/749704.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_749704(texture2d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureLoad_749704(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_749704(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_749704(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/749704.wgsl.expected.spvasm
deleted file mode 100644
index 40218e3425..0000000000
--- a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/749704.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_749704 "textureLoad_749704"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %22 = OpConstantNull %v2int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_749704 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_749704
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_749704
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_749704
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/749704.wgsl.expected.wgsl
deleted file mode 100644
index cef067d763..0000000000
--- a/test/intrinsics/gen/textureLoad/749704.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/749704.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<r32uint, read>;
-
-fn textureLoad_749704() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_749704();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_749704();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_749704();
-}
diff --git a/test/intrinsics/gen/textureLoad/83cea4.wgsl b/test/intrinsics/gen/textureLoad/83cea4.wgsl
deleted file mode 100644
index adba94c374..0000000000
--- a/test/intrinsics/gen/textureLoad/83cea4.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba16uint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba16uint, read>, coords: i32) -> vec4<u32>
-fn textureLoad_83cea4() {
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_83cea4();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_83cea4();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_83cea4();
-}
diff --git a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.hlsl
deleted file mode 100644
index 683de66fa3..0000000000
--- a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/83cea4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_83cea4() {
-  uint4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_83cea4();
-  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() {
-  textureLoad_83cea4();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_83cea4();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.msl
deleted file mode 100644
index 5002e23376..0000000000
--- a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/83cea4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_83cea4(texture1d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<uint, access::read> tint_symbol_2) {
-  textureLoad_83cea4(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_83cea4(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_83cea4(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.spvasm
deleted file mode 100644
index 9e8e53d2ea..0000000000
--- a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/83cea4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_83cea4 "textureLoad_83cea4"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %24 = OpConstantNull %v4uint
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_83cea4 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_83cea4
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_83cea4
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_83cea4
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.wgsl
deleted file mode 100644
index 6ed2812799..0000000000
--- a/test/intrinsics/gen/textureLoad/83cea4.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/83cea4.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba16uint, read>;
-
-fn textureLoad_83cea4() {
-  var res : vec4<u32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_83cea4();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_83cea4();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_83cea4();
-}
diff --git a/test/intrinsics/gen/textureLoad/8e5032.wgsl b/test/intrinsics/gen/textureLoad/8e5032.wgsl
deleted file mode 100644
index e3668b71cc..0000000000
--- a/test/intrinsics/gen/textureLoad/8e5032.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rg32uint, read>, coords: vec2<i32>, array_index: i32) -> vec4<u32>
-fn textureLoad_8e5032() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_8e5032();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_8e5032();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_8e5032();
-}
diff --git a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.hlsl
deleted file mode 100644
index 547df77bfd..0000000000
--- a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/8e5032.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_8e5032() {
-  uint4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_8e5032();
-  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() {
-  textureLoad_8e5032();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_8e5032();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.msl
deleted file mode 100644
index 3eec472bde..0000000000
--- a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/8e5032.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_8e5032(texture2d_array<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureLoad_8e5032(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_8e5032(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_8e5032(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.spvasm
deleted file mode 100644
index 4f6a5fcbbb..0000000000
--- a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.spvasm
+++ /dev/null
@@ -1,85 +0,0 @@
-intrinsics/gen/textureLoad/8e5032.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 42
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_8e5032 "textureLoad_8e5032"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %24 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %27 = OpConstantNull %v4uint
-         %28 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_8e5032 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %27
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %24
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %28
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %textureLoad_8e5032
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %34
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_8e5032
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %40 = OpLabel
-         %41 = OpFunctionCall %void %textureLoad_8e5032
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.wgsl
deleted file mode 100644
index 3f79e6eb06..0000000000
--- a/test/intrinsics/gen/textureLoad/8e5032.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/8e5032.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32uint, read>;
-
-fn textureLoad_8e5032() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_8e5032();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_8e5032();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_8e5032();
-}
diff --git a/test/intrinsics/gen/textureLoad/936952.wgsl b/test/intrinsics/gen/textureLoad/936952.wgsl
deleted file mode 100644
index 66c12c55a7..0000000000
--- a/test/intrinsics/gen/textureLoad/936952.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32float, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba32float, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32>
-fn textureLoad_936952() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_936952();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_936952();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_936952();
-}
diff --git a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/936952.wgsl.expected.hlsl
deleted file mode 100644
index fa31b4c6cb..0000000000
--- a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/936952.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureLoad_936952() {
-  float4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_936952();
-  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() {
-  textureLoad_936952();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_936952();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/936952.wgsl.expected.msl
deleted file mode 100644
index 930e783660..0000000000
--- a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/936952.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_936952(texture2d_array<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureLoad_936952(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_936952(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_936952(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/936952.wgsl.expected.spvasm
deleted file mode 100644
index befa7f03bf..0000000000
--- a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/936952.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_936952 "textureLoad_936952"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %22 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_936952 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %22
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_936952
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_936952
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_936952
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/936952.wgsl.expected.wgsl
deleted file mode 100644
index 55cf2b856c..0000000000
--- a/test/intrinsics/gen/textureLoad/936952.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/936952.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32float, read>;
-
-fn textureLoad_936952() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_936952();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_936952();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_936952();
-}
diff --git a/test/intrinsics/gen/textureLoad/9a7c90.wgsl b/test/intrinsics/gen/textureLoad/9a7c90.wgsl
deleted file mode 100644
index dbb5b57ce6..0000000000
--- a/test/intrinsics/gen/textureLoad/9a7c90.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8uint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba8uint, read>, coords: vec3<i32>) -> vec4<u32>
-fn textureLoad_9a7c90() {
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_9a7c90();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_9a7c90();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_9a7c90();
-}
diff --git a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.hlsl
deleted file mode 100644
index cccfb5a022..0000000000
--- a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/9a7c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_9a7c90() {
-  uint4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_9a7c90();
-  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() {
-  textureLoad_9a7c90();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_9a7c90();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.msl
deleted file mode 100644
index d78849d383..0000000000
--- a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/9a7c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_9a7c90(texture3d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureLoad_9a7c90(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_9a7c90(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_9a7c90(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.spvasm
deleted file mode 100644
index c3f2586d08..0000000000
--- a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/9a7c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_9a7c90 "textureLoad_9a7c90"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %22 = OpConstantNull %v3int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_9a7c90 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_9a7c90
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_9a7c90
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_9a7c90
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.wgsl
deleted file mode 100644
index b08af9a299..0000000000
--- a/test/intrinsics/gen/textureLoad/9a7c90.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/9a7c90.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8uint, read>;
-
-fn textureLoad_9a7c90() {
-  var res : vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_9a7c90();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_9a7c90();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_9a7c90();
-}
diff --git a/test/intrinsics/gen/textureLoad/9c2a14.wgsl b/test/intrinsics/gen/textureLoad/9c2a14.wgsl
deleted file mode 100644
index 4ebe9ff207..0000000000
--- a/test/intrinsics/gen/textureLoad/9c2a14.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rg32float, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rg32float, read>, coords: vec2<i32>) -> vec4<f32>
-fn textureLoad_9c2a14() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_9c2a14();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_9c2a14();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_9c2a14();
-}
diff --git a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.hlsl
deleted file mode 100644
index 0af29cf394..0000000000
--- a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/9c2a14.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_9c2a14() {
-  float4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_9c2a14();
-  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() {
-  textureLoad_9c2a14();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_9c2a14();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.msl
deleted file mode 100644
index fc8bfb699c..0000000000
--- a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/9c2a14.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_9c2a14(texture2d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureLoad_9c2a14(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_9c2a14(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_9c2a14(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.spvasm
deleted file mode 100644
index edb9c695eb..0000000000
--- a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.spvasm
+++ /dev/null
@@ -1,80 +0,0 @@
-intrinsics/gen/textureLoad/9c2a14.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_9c2a14 "textureLoad_9c2a14"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %20 = OpConstantNull %v2int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_9c2a14 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_9c2a14
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_9c2a14
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_9c2a14
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.wgsl
deleted file mode 100644
index 9c09f9f888..0000000000
--- a/test/intrinsics/gen/textureLoad/9c2a14.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/9c2a14.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rg32float, read>;
-
-fn textureLoad_9c2a14() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_9c2a14();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_9c2a14();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_9c2a14();
-}
diff --git a/test/intrinsics/gen/textureLoad/a6a85a.wgsl b/test/intrinsics/gen/textureLoad/a6a85a.wgsl
deleted file mode 100644
index b43f80ebd9..0000000000
--- a/test/intrinsics/gen/textureLoad/a6a85a.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba8unorm, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba8unorm, read>, coords: vec3<i32>) -> vec4<f32>
-fn textureLoad_a6a85a() {
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_a6a85a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_a6a85a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_a6a85a();
-}
diff --git a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.hlsl
deleted file mode 100644
index 86f30d8c31..0000000000
--- a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/a6a85a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_a6a85a() {
-  float4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_a6a85a();
-  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() {
-  textureLoad_a6a85a();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_a6a85a();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.msl
deleted file mode 100644
index 368b3713b5..0000000000
--- a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/a6a85a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_a6a85a(texture3d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureLoad_a6a85a(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_a6a85a(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_a6a85a(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.spvasm
deleted file mode 100644
index 7b72c44326..0000000000
--- a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/a6a85a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_a6a85a "textureLoad_a6a85a"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %20 = OpConstantNull %v3int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_a6a85a = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_a6a85a
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_a6a85a
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_a6a85a
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.wgsl
deleted file mode 100644
index 768bff655e..0000000000
--- a/test/intrinsics/gen/textureLoad/a6a85a.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/a6a85a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba8unorm, read>;
-
-fn textureLoad_a6a85a() {
-  var res : vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_a6a85a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_a6a85a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_a6a85a();
-}
diff --git a/test/intrinsics/gen/textureLoad/a6b61d.wgsl b/test/intrinsics/gen/textureLoad/a6b61d.wgsl
deleted file mode 100644
index 799a26d345..0000000000
--- a/test/intrinsics/gen/textureLoad/a6b61d.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba32sint, read>, coords: vec2<i32>, array_index: i32) -> vec4<i32>
-fn textureLoad_a6b61d() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_a6b61d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_a6b61d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_a6b61d();
-}
diff --git a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.hlsl
deleted file mode 100644
index 5e5263af5a..0000000000
--- a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/a6b61d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureLoad_a6b61d() {
-  int4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_a6b61d();
-  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() {
-  textureLoad_a6b61d();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_a6b61d();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.msl
deleted file mode 100644
index f1125ccade..0000000000
--- a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/a6b61d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_a6b61d(texture2d_array<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureLoad_a6b61d(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_a6b61d(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_a6b61d(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.spvasm
deleted file mode 100644
index f8bea3f54c..0000000000
--- a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-intrinsics/gen/textureLoad/a6b61d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 41
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_a6b61d "textureLoad_a6b61d"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %23 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %26 = OpConstantNull %v4int
-         %27 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_a6b61d = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %26
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %23
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %27
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %textureLoad_a6b61d
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %33
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_a6b61d
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %39 = OpLabel
-         %40 = OpFunctionCall %void %textureLoad_a6b61d
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.wgsl
deleted file mode 100644
index 5271286929..0000000000
--- a/test/intrinsics/gen/textureLoad/a6b61d.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/a6b61d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32sint, read>;
-
-fn textureLoad_a6b61d() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_a6b61d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_a6b61d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_a6b61d();
-}
diff --git a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl b/test/intrinsics/gen/textureLoad/a7a3c3.wgsl
deleted file mode 100644
index 96c075ff2f..0000000000
--- a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba16sint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba16sint, read>, coords: vec3<i32>) -> vec4<i32>
-fn textureLoad_a7a3c3() {
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_a7a3c3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_a7a3c3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_a7a3c3();
-}
diff --git a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.hlsl
deleted file mode 100644
index 5999e43f7a..0000000000
--- a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/a7a3c3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_a7a3c3() {
-  int4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_a7a3c3();
-  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() {
-  textureLoad_a7a3c3();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_a7a3c3();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.msl
deleted file mode 100644
index 57a5f5aff6..0000000000
--- a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/a7a3c3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_a7a3c3(texture3d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureLoad_a7a3c3(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_a7a3c3(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_a7a3c3(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.spvasm
deleted file mode 100644
index bca5554f9c..0000000000
--- a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/a7a3c3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_a7a3c3 "textureLoad_a7a3c3"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-         %21 = OpConstantNull %v3int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_a7a3c3 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_a7a3c3
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_a7a3c3
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_a7a3c3
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.wgsl
deleted file mode 100644
index dc0d38960f..0000000000
--- a/test/intrinsics/gen/textureLoad/a7a3c3.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/a7a3c3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba16sint, read>;
-
-fn textureLoad_a7a3c3() {
-  var res : vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_a7a3c3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_a7a3c3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_a7a3c3();
-}
diff --git a/test/intrinsics/gen/textureLoad/b1bf79.wgsl b/test/intrinsics/gen/textureLoad/b1bf79.wgsl
deleted file mode 100644
index c89498857d..0000000000
--- a/test/intrinsics/gen/textureLoad/b1bf79.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba32sint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba32sint, read>, coords: vec3<i32>) -> vec4<i32>
-fn textureLoad_b1bf79() {
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_b1bf79();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_b1bf79();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_b1bf79();
-}
diff --git a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.hlsl
deleted file mode 100644
index 166cf3e6d1..0000000000
--- a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/b1bf79.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_b1bf79() {
-  int4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_b1bf79();
-  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() {
-  textureLoad_b1bf79();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_b1bf79();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.msl
deleted file mode 100644
index 49cde1da51..0000000000
--- a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/b1bf79.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_b1bf79(texture3d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureLoad_b1bf79(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_b1bf79(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_b1bf79(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.spvasm
deleted file mode 100644
index dbac120f90..0000000000
--- a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/b1bf79.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_b1bf79 "textureLoad_b1bf79"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-         %21 = OpConstantNull %v3int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_b1bf79 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_b1bf79
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_b1bf79
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_b1bf79
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.wgsl
deleted file mode 100644
index 53fe095f3d..0000000000
--- a/test/intrinsics/gen/textureLoad/b1bf79.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/b1bf79.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba32sint, read>;
-
-fn textureLoad_b1bf79() {
-  var res : vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_b1bf79();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_b1bf79();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_b1bf79();
-}
diff --git a/test/intrinsics/gen/textureLoad/b58c6d.wgsl b/test/intrinsics/gen/textureLoad/b58c6d.wgsl
deleted file mode 100644
index c57d3c70d8..0000000000
--- a/test/intrinsics/gen/textureLoad/b58c6d.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32float, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<r32float, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32>
-fn textureLoad_b58c6d() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_b58c6d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_b58c6d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_b58c6d();
-}
diff --git a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.hlsl
deleted file mode 100644
index 3741b1ce93..0000000000
--- a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/b58c6d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureLoad_b58c6d() {
-  float4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_b58c6d();
-  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() {
-  textureLoad_b58c6d();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_b58c6d();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.msl
deleted file mode 100644
index 40301b78ea..0000000000
--- a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/b58c6d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_b58c6d(texture2d_array<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureLoad_b58c6d(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_b58c6d(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_b58c6d(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.spvasm
deleted file mode 100644
index b6cad38dcc..0000000000
--- a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/b58c6d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_b58c6d "textureLoad_b58c6d"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %22 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_b58c6d = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %22
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_b58c6d
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_b58c6d
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_b58c6d
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.wgsl
deleted file mode 100644
index b37931aada..0000000000
--- a/test/intrinsics/gen/textureLoad/b58c6d.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/b58c6d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32float, read>;
-
-fn textureLoad_b58c6d() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_b58c6d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_b58c6d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_b58c6d();
-}
diff --git a/test/intrinsics/gen/textureLoad/b6c458.wgsl b/test/intrinsics/gen/textureLoad/b6c458.wgsl
deleted file mode 100644
index 3e38b55e01..0000000000
--- a/test/intrinsics/gen/textureLoad/b6c458.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba32uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba32uint, read>, coords: vec2<i32>) -> vec4<u32>
-fn textureLoad_b6c458() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_b6c458();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_b6c458();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_b6c458();
-}
diff --git a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.hlsl
deleted file mode 100644
index 962ed40be9..0000000000
--- a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/b6c458.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_b6c458() {
-  uint4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_b6c458();
-  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() {
-  textureLoad_b6c458();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_b6c458();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.msl
deleted file mode 100644
index b11df76bac..0000000000
--- a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/b6c458.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_b6c458(texture2d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureLoad_b6c458(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_b6c458(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_b6c458(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.spvasm
deleted file mode 100644
index 93350a90a7..0000000000
--- a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/b6c458.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_b6c458 "textureLoad_b6c458"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %22 = OpConstantNull %v2int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_b6c458 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_b6c458
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_b6c458
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_b6c458
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.wgsl
deleted file mode 100644
index 31d127979c..0000000000
--- a/test/intrinsics/gen/textureLoad/b6c458.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/b6c458.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba32uint, read>;
-
-fn textureLoad_b6c458() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_b6c458();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_b6c458();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_b6c458();
-}
diff --git a/test/intrinsics/gen/textureLoad/bfd154.wgsl b/test/intrinsics/gen/textureLoad/bfd154.wgsl
deleted file mode 100644
index eeca372cdc..0000000000
--- a/test/intrinsics/gen/textureLoad/bfd154.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<r32uint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<r32uint, read>, coords: vec3<i32>) -> vec4<u32>
-fn textureLoad_bfd154() {
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_bfd154();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_bfd154();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_bfd154();
-}
diff --git a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.hlsl
deleted file mode 100644
index aef20ba753..0000000000
--- a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/bfd154.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_bfd154() {
-  uint4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_bfd154();
-  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() {
-  textureLoad_bfd154();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_bfd154();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.msl
deleted file mode 100644
index 3d002d8c13..0000000000
--- a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/bfd154.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_bfd154(texture3d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureLoad_bfd154(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_bfd154(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_bfd154(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.spvasm
deleted file mode 100644
index 2bd1310452..0000000000
--- a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/bfd154.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_bfd154 "textureLoad_bfd154"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %22 = OpConstantNull %v3int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_bfd154 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_bfd154
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_bfd154
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_bfd154
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.wgsl
deleted file mode 100644
index 1f4a445814..0000000000
--- a/test/intrinsics/gen/textureLoad/bfd154.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/bfd154.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<r32uint, read>;
-
-fn textureLoad_bfd154() {
-  var res : vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_bfd154();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_bfd154();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_bfd154();
-}
diff --git a/test/intrinsics/gen/textureLoad/c02b74.wgsl b/test/intrinsics/gen/textureLoad/c02b74.wgsl
deleted file mode 100644
index 73fa7aba65..0000000000
--- a/test/intrinsics/gen/textureLoad/c02b74.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba16float, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba16float, read>, coords: i32) -> vec4<f32>
-fn textureLoad_c02b74() {
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c02b74();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c02b74();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c02b74();
-}
diff --git a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.hlsl
deleted file mode 100644
index 0b67c3d6bf..0000000000
--- a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/c02b74.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_c02b74() {
-  float4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_c02b74();
-  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() {
-  textureLoad_c02b74();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_c02b74();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.msl
deleted file mode 100644
index 9646722482..0000000000
--- a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/c02b74.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_c02b74(texture1d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureLoad_c02b74(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_c02b74(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_c02b74(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.spvasm
deleted file mode 100644
index 6394655fa1..0000000000
--- a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/c02b74.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_c02b74 "textureLoad_c02b74"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_c02b74 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %int_1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureLoad_c02b74
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureLoad_c02b74
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_c02b74
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.wgsl
deleted file mode 100644
index 72e5c087d3..0000000000
--- a/test/intrinsics/gen/textureLoad/c02b74.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/c02b74.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba16float, read>;
-
-fn textureLoad_c02b74() {
-  var res : vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c02b74();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c02b74();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c02b74();
-}
diff --git a/test/intrinsics/gen/textureLoad/c07013.wgsl b/test/intrinsics/gen/textureLoad/c07013.wgsl
deleted file mode 100644
index c62fc7070a..0000000000
--- a/test/intrinsics/gen/textureLoad/c07013.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<r32float, read>;
-
-// fn textureLoad(texture: texture_storage_2d<r32float, read>, coords: vec2<i32>) -> vec4<f32>
-fn textureLoad_c07013() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c07013();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c07013();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c07013();
-}
diff --git a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.hlsl
deleted file mode 100644
index fb9f4cd25c..0000000000
--- a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/c07013.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_c07013() {
-  float4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_c07013();
-  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() {
-  textureLoad_c07013();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_c07013();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.msl
deleted file mode 100644
index 31c42bc089..0000000000
--- a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/c07013.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_c07013(texture2d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureLoad_c07013(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_c07013(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_c07013(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.spvasm
deleted file mode 100644
index b21a9218d0..0000000000
--- a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/c07013.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_c07013 "textureLoad_c07013"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %20 = OpConstantNull %v2int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_c07013 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_c07013
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_c07013
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_c07013
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.wgsl
deleted file mode 100644
index 0c67e412fb..0000000000
--- a/test/intrinsics/gen/textureLoad/c07013.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/c07013.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<r32float, read>;
-
-fn textureLoad_c07013() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c07013();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c07013();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c07013();
-}
diff --git a/test/intrinsics/gen/textureLoad/c40dcb.wgsl b/test/intrinsics/gen/textureLoad/c40dcb.wgsl
deleted file mode 100644
index 594a459100..0000000000
--- a/test/intrinsics/gen/textureLoad/c40dcb.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba32uint, read>, coords: vec2<i32>, array_index: i32) -> vec4<u32>
-fn textureLoad_c40dcb() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c40dcb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c40dcb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c40dcb();
-}
diff --git a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.hlsl
deleted file mode 100644
index a64e8d0c33..0000000000
--- a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/c40dcb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_c40dcb() {
-  uint4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_c40dcb();
-  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() {
-  textureLoad_c40dcb();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_c40dcb();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.msl
deleted file mode 100644
index 978e62e24e..0000000000
--- a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/c40dcb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_c40dcb(texture2d_array<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureLoad_c40dcb(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_c40dcb(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_c40dcb(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.spvasm
deleted file mode 100644
index ab5e2b6582..0000000000
--- a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.spvasm
+++ /dev/null
@@ -1,84 +0,0 @@
-intrinsics/gen/textureLoad/c40dcb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 42
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_c40dcb "textureLoad_c40dcb"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %24 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %27 = OpConstantNull %v4uint
-         %28 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_c40dcb = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %27
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %24
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %28
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %textureLoad_c40dcb
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %34
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_c40dcb
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %40 = OpLabel
-         %41 = OpFunctionCall %void %textureLoad_c40dcb
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.wgsl
deleted file mode 100644
index 3687d37998..0000000000
--- a/test/intrinsics/gen/textureLoad/c40dcb.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/c40dcb.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32uint, read>;
-
-fn textureLoad_c40dcb() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c40dcb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c40dcb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c40dcb();
-}
diff --git a/test/intrinsics/gen/textureLoad/c456bc.wgsl b/test/intrinsics/gen/textureLoad/c456bc.wgsl
deleted file mode 100644
index 93b7fa2d61..0000000000
--- a/test/intrinsics/gen/textureLoad/c456bc.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<r32float, read>;
-
-// fn textureLoad(texture: texture_storage_3d<r32float, read>, coords: vec3<i32>) -> vec4<f32>
-fn textureLoad_c456bc() {
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c456bc();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c456bc();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c456bc();
-}
diff --git a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.hlsl
deleted file mode 100644
index a8e51a1a78..0000000000
--- a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/c456bc.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_c456bc() {
-  float4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_c456bc();
-  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() {
-  textureLoad_c456bc();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_c456bc();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.msl
deleted file mode 100644
index 3d6648f9fe..0000000000
--- a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/c456bc.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_c456bc(texture3d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureLoad_c456bc(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_c456bc(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_c456bc(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.spvasm
deleted file mode 100644
index bbc1ef8b48..0000000000
--- a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/c456bc.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_c456bc "textureLoad_c456bc"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %20 = OpConstantNull %v3int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_c456bc = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_c456bc
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_c456bc
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_c456bc
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.wgsl
deleted file mode 100644
index 670c29edff..0000000000
--- a/test/intrinsics/gen/textureLoad/c456bc.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/c456bc.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<r32float, read>;
-
-fn textureLoad_c456bc() {
-  var res : vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c456bc();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c456bc();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c456bc();
-}
diff --git a/test/intrinsics/gen/textureLoad/c7cbed.wgsl b/test/intrinsics/gen/textureLoad/c7cbed.wgsl
deleted file mode 100644
index 48257df18b..0000000000
--- a/test/intrinsics/gen/textureLoad/c7cbed.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<r32float, read>;
-
-// fn textureLoad(texture: texture_storage_1d<r32float, read>, coords: i32) -> vec4<f32>
-fn textureLoad_c7cbed() {
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c7cbed();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c7cbed();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c7cbed();
-}
diff --git a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.hlsl
deleted file mode 100644
index 696a14a74c..0000000000
--- a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/c7cbed.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_c7cbed() {
-  float4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_c7cbed();
-  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() {
-  textureLoad_c7cbed();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_c7cbed();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.msl
deleted file mode 100644
index 398e55c26c..0000000000
--- a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/c7cbed.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_c7cbed(texture1d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureLoad_c7cbed(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_c7cbed(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_c7cbed(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.spvasm
deleted file mode 100644
index 94da0174e8..0000000000
--- a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/c7cbed.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_c7cbed "textureLoad_c7cbed"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_c7cbed = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %int_1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureLoad_c7cbed
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureLoad_c7cbed
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_c7cbed
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.wgsl
deleted file mode 100644
index de2937702b..0000000000
--- a/test/intrinsics/gen/textureLoad/c7cbed.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/c7cbed.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<r32float, read>;
-
-fn textureLoad_c7cbed() {
-  var res : vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c7cbed();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c7cbed();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c7cbed();
-}
diff --git a/test/intrinsics/gen/textureLoad/c9cc40.wgsl b/test/intrinsics/gen/textureLoad/c9cc40.wgsl
deleted file mode 100644
index 9f7244e7a3..0000000000
--- a/test/intrinsics/gen/textureLoad/c9cc40.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8sint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba8sint, read>, coords: i32) -> vec4<i32>
-fn textureLoad_c9cc40() {
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c9cc40();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c9cc40();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c9cc40();
-}
diff --git a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.hlsl
deleted file mode 100644
index b3d52e74bc..0000000000
--- a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/c9cc40.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_c9cc40() {
-  int4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_c9cc40();
-  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() {
-  textureLoad_c9cc40();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_c9cc40();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.msl
deleted file mode 100644
index 9956489aba..0000000000
--- a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/c9cc40.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_c9cc40(texture1d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureLoad_c9cc40(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_c9cc40(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_c9cc40(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.spvasm
deleted file mode 100644
index ba72b53127..0000000000
--- a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/c9cc40.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_c9cc40 "textureLoad_c9cc40"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %23 = OpConstantNull %v4int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_c9cc40 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %23
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureLoad_c9cc40
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureLoad_c9cc40
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_c9cc40
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.wgsl
deleted file mode 100644
index a45700a4ea..0000000000
--- a/test/intrinsics/gen/textureLoad/c9cc40.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/c9cc40.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8sint, read>;
-
-fn textureLoad_c9cc40() {
-  var res : vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_c9cc40();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_c9cc40();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_c9cc40();
-}
diff --git a/test/intrinsics/gen/textureLoad/d5c48d.wgsl b/test/intrinsics/gen/textureLoad/d5c48d.wgsl
deleted file mode 100644
index 493ebe94ce..0000000000
--- a/test/intrinsics/gen/textureLoad/d5c48d.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba32float, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba32float, read>, coords: vec2<i32>) -> vec4<f32>
-fn textureLoad_d5c48d() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_d5c48d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_d5c48d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_d5c48d();
-}
diff --git a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.hlsl
deleted file mode 100644
index d1fc3168ca..0000000000
--- a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/d5c48d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_d5c48d() {
-  float4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_d5c48d();
-  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() {
-  textureLoad_d5c48d();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_d5c48d();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.msl
deleted file mode 100644
index 7ce7b01d96..0000000000
--- a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/d5c48d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_d5c48d(texture2d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureLoad_d5c48d(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_d5c48d(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_d5c48d(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.spvasm
deleted file mode 100644
index 1d73e80e24..0000000000
--- a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/d5c48d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_d5c48d "textureLoad_d5c48d"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %20 = OpConstantNull %v2int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_d5c48d = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_d5c48d
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_d5c48d
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_d5c48d
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.wgsl
deleted file mode 100644
index 5fe6871ca6..0000000000
--- a/test/intrinsics/gen/textureLoad/d5c48d.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/d5c48d.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba32float, read>;
-
-fn textureLoad_d5c48d() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_d5c48d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_d5c48d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_d5c48d();
-}
diff --git a/test/intrinsics/gen/textureLoad/d81c57.wgsl b/test/intrinsics/gen/textureLoad/d81c57.wgsl
deleted file mode 100644
index fa61d8a145..0000000000
--- a/test/intrinsics/gen/textureLoad/d81c57.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rg32float, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rg32float, read>, coords: i32) -> vec4<f32>
-fn textureLoad_d81c57() {
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_d81c57();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_d81c57();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_d81c57();
-}
diff --git a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.hlsl
deleted file mode 100644
index 0816747323..0000000000
--- a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/d81c57.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_d81c57() {
-  float4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_d81c57();
-  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() {
-  textureLoad_d81c57();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_d81c57();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.msl
deleted file mode 100644
index cb89b9cccf..0000000000
--- a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/d81c57.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_d81c57(texture1d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureLoad_d81c57(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_d81c57(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_d81c57(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.spvasm
deleted file mode 100644
index 9e79b75c63..0000000000
--- a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.spvasm
+++ /dev/null
@@ -1,80 +0,0 @@
-intrinsics/gen/textureLoad/d81c57.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_d81c57 "textureLoad_d81c57"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_d81c57 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %int_1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureLoad_d81c57
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureLoad_d81c57
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_d81c57
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.wgsl
deleted file mode 100644
index 8194b3fd99..0000000000
--- a/test/intrinsics/gen/textureLoad/d81c57.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/d81c57.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rg32float, read>;
-
-fn textureLoad_d81c57() {
-  var res : vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_d81c57();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_d81c57();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_d81c57();
-}
diff --git a/test/intrinsics/gen/textureLoad/d8617f.wgsl b/test/intrinsics/gen/textureLoad/d8617f.wgsl
deleted file mode 100644
index 38f1750140..0000000000
--- a/test/intrinsics/gen/textureLoad/d8617f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rg32sint, read>, coords: vec2<i32>, array_index: i32) -> vec4<i32>
-fn textureLoad_d8617f() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_d8617f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_d8617f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_d8617f();
-}
diff --git a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.hlsl
deleted file mode 100644
index 8f1f44368e..0000000000
--- a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/d8617f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureLoad_d8617f() {
-  int4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_d8617f();
-  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() {
-  textureLoad_d8617f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_d8617f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.msl
deleted file mode 100644
index e936681fbc..0000000000
--- a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/d8617f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_d8617f(texture2d_array<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureLoad_d8617f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_d8617f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_d8617f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.spvasm
deleted file mode 100644
index 369b377f0c..0000000000
--- a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,84 +0,0 @@
-intrinsics/gen/textureLoad/d8617f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 41
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_d8617f "textureLoad_d8617f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %23 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %26 = OpConstantNull %v4int
-         %27 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_d8617f = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %26
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %23
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %27
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %textureLoad_d8617f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %33
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_d8617f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %39 = OpLabel
-         %40 = OpFunctionCall %void %textureLoad_d8617f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.wgsl
deleted file mode 100644
index c1ff8e13a8..0000000000
--- a/test/intrinsics/gen/textureLoad/d8617f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/d8617f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32sint, read>;
-
-fn textureLoad_d8617f() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_d8617f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_d8617f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_d8617f();
-}
diff --git a/test/intrinsics/gen/textureLoad/dbd554.wgsl b/test/intrinsics/gen/textureLoad/dbd554.wgsl
deleted file mode 100644
index 75628f3fad..0000000000
--- a/test/intrinsics/gen/textureLoad/dbd554.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba32sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba32sint, read>, coords: vec2<i32>) -> vec4<i32>
-fn textureLoad_dbd554() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_dbd554();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_dbd554();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_dbd554();
-}
diff --git a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.hlsl
deleted file mode 100644
index 46091ee67f..0000000000
--- a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/dbd554.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_dbd554() {
-  int4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_dbd554();
-  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() {
-  textureLoad_dbd554();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_dbd554();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.msl
deleted file mode 100644
index f7441193c5..0000000000
--- a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/dbd554.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_dbd554(texture2d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureLoad_dbd554(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_dbd554(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_dbd554(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.spvasm
deleted file mode 100644
index 65e1063f1c..0000000000
--- a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/dbd554.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_dbd554 "textureLoad_dbd554"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v2int = OpTypeVector %int 2
-         %21 = OpConstantNull %v2int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_dbd554 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_dbd554
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_dbd554
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_dbd554
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.wgsl
deleted file mode 100644
index 5cb31cef87..0000000000
--- a/test/intrinsics/gen/textureLoad/dbd554.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/dbd554.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba32sint, read>;
-
-fn textureLoad_dbd554() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_dbd554();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_dbd554();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_dbd554();
-}
diff --git a/test/intrinsics/gen/textureLoad/ddeed3.wgsl b/test/intrinsics/gen/textureLoad/ddeed3.wgsl
deleted file mode 100644
index da63a5b4dc..0000000000
--- a/test/intrinsics/gen/textureLoad/ddeed3.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba32sint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba32sint, read>, coords: i32) -> vec4<i32>
-fn textureLoad_ddeed3() {
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_ddeed3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_ddeed3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_ddeed3();
-}
diff --git a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.hlsl
deleted file mode 100644
index 8149e79fc2..0000000000
--- a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/ddeed3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_ddeed3() {
-  int4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_ddeed3();
-  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() {
-  textureLoad_ddeed3();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_ddeed3();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.msl
deleted file mode 100644
index e9ca3a4301..0000000000
--- a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/ddeed3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_ddeed3(texture1d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureLoad_ddeed3(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_ddeed3(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_ddeed3(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.spvasm
deleted file mode 100644
index f4850becf1..0000000000
--- a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/ddeed3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_ddeed3 "textureLoad_ddeed3"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %23 = OpConstantNull %v4int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_ddeed3 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %23
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureLoad_ddeed3
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureLoad_ddeed3
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_ddeed3
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.wgsl
deleted file mode 100644
index fcd47bbfa5..0000000000
--- a/test/intrinsics/gen/textureLoad/ddeed3.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/ddeed3.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba32sint, read>;
-
-fn textureLoad_ddeed3() {
-  var res : vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_ddeed3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_ddeed3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_ddeed3();
-}
diff --git a/test/intrinsics/gen/textureLoad/dee8e7.wgsl b/test/intrinsics/gen/textureLoad/dee8e7.wgsl
deleted file mode 100644
index 8eaedf649e..0000000000
--- a/test/intrinsics/gen/textureLoad/dee8e7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba8sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba8sint, read>, coords: vec2<i32>) -> vec4<i32>
-fn textureLoad_dee8e7() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_dee8e7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_dee8e7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_dee8e7();
-}
diff --git a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.hlsl
deleted file mode 100644
index 75d4d95cce..0000000000
--- a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/dee8e7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_dee8e7() {
-  int4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_dee8e7();
-  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() {
-  textureLoad_dee8e7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_dee8e7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.msl
deleted file mode 100644
index dd88b08320..0000000000
--- a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/dee8e7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_dee8e7(texture2d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureLoad_dee8e7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_dee8e7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_dee8e7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.spvasm
deleted file mode 100644
index deb06cabc0..0000000000
--- a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/dee8e7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_dee8e7 "textureLoad_dee8e7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v2int = OpTypeVector %int 2
-         %21 = OpConstantNull %v2int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_dee8e7 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_dee8e7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_dee8e7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_dee8e7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.wgsl
deleted file mode 100644
index 2b6a37dd32..0000000000
--- a/test/intrinsics/gen/textureLoad/dee8e7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/dee8e7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba8sint, read>;
-
-fn textureLoad_dee8e7() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_dee8e7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_dee8e7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_dee8e7();
-}
diff --git a/test/intrinsics/gen/textureLoad/e65916.wgsl b/test/intrinsics/gen/textureLoad/e65916.wgsl
deleted file mode 100644
index 3dbc014410..0000000000
--- a/test/intrinsics/gen/textureLoad/e65916.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rg32sint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rg32sint, read>, coords: vec3<i32>) -> vec4<i32>
-fn textureLoad_e65916() {
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_e65916();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_e65916();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_e65916();
-}
diff --git a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.hlsl
deleted file mode 100644
index b61dd42312..0000000000
--- a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/e65916.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_e65916() {
-  int4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_e65916();
-  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() {
-  textureLoad_e65916();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_e65916();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.msl
deleted file mode 100644
index 25bb247783..0000000000
--- a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/e65916.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_e65916(texture3d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<int, access::read> tint_symbol_2) {
-  textureLoad_e65916(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_e65916(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_e65916(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.spvasm
deleted file mode 100644
index 8fe3311ba0..0000000000
--- a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/e65916.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_e65916 "textureLoad_e65916"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 3D 0 0 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-         %21 = OpConstantNull %v3int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_e65916 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_e65916
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_e65916
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_e65916
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.wgsl
deleted file mode 100644
index 2365920cdc..0000000000
--- a/test/intrinsics/gen/textureLoad/e65916.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/e65916.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rg32sint, read>;
-
-fn textureLoad_e65916() {
-  var res : vec4<i32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_e65916();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_e65916();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_e65916();
-}
diff --git a/test/intrinsics/gen/textureLoad/e893d7.wgsl b/test/intrinsics/gen/textureLoad/e893d7.wgsl
deleted file mode 100644
index 9c48945915..0000000000
--- a/test/intrinsics/gen/textureLoad/e893d7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba16float, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba16float, read>, coords: vec2<i32>) -> vec4<f32>
-fn textureLoad_e893d7() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_e893d7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_e893d7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_e893d7();
-}
diff --git a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.hlsl
deleted file mode 100644
index 3bee800c9a..0000000000
--- a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/e893d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_e893d7() {
-  float4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_e893d7();
-  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() {
-  textureLoad_e893d7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_e893d7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.msl
deleted file mode 100644
index a9c1f6df76..0000000000
--- a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/e893d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_e893d7(texture2d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<float, access::read> tint_symbol_2) {
-  textureLoad_e893d7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_e893d7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_e893d7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.spvasm
deleted file mode 100644
index 15f06086d8..0000000000
--- a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/e893d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_e893d7 "textureLoad_e893d7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %20 = OpConstantNull %v2int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_e893d7 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_e893d7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_e893d7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_e893d7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.wgsl
deleted file mode 100644
index 350f1d9122..0000000000
--- a/test/intrinsics/gen/textureLoad/e893d7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/e893d7.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba16float, read>;
-
-fn textureLoad_e893d7() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_e893d7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_e893d7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_e893d7();
-}
diff --git a/test/intrinsics/gen/textureLoad/eb573b.wgsl b/test/intrinsics/gen/textureLoad/eb573b.wgsl
deleted file mode 100644
index e809e869a1..0000000000
--- a/test/intrinsics/gen/textureLoad/eb573b.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<r32sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<r32sint, read>, coords: vec2<i32>) -> vec4<i32>
-fn textureLoad_eb573b() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_eb573b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_eb573b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_eb573b();
-}
diff --git a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.hlsl
deleted file mode 100644
index 2ac4a4c4fe..0000000000
--- a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/eb573b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_eb573b() {
-  int4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_eb573b();
-  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() {
-  textureLoad_eb573b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_eb573b();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.msl
deleted file mode 100644
index 1fb47234af..0000000000
--- a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/eb573b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_eb573b(texture2d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<int, access::read> tint_symbol_2) {
-  textureLoad_eb573b(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_eb573b(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_eb573b(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.spvasm
deleted file mode 100644
index 788f96a11b..0000000000
--- a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/eb573b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_eb573b "textureLoad_eb573b"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 0 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v2int = OpTypeVector %int 2
-         %21 = OpConstantNull %v2int
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %24 = OpConstantNull %v4int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_eb573b = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %24
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %21
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_eb573b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_eb573b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_eb573b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.wgsl
deleted file mode 100644
index f5dd5e2f4b..0000000000
--- a/test/intrinsics/gen/textureLoad/eb573b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/eb573b.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<r32sint, read>;
-
-fn textureLoad_eb573b() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_eb573b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_eb573b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_eb573b();
-}
diff --git a/test/intrinsics/gen/textureLoad/ecc823.wgsl b/test/intrinsics/gen/textureLoad/ecc823.wgsl
deleted file mode 100644
index a66cd91ca2..0000000000
--- a/test/intrinsics/gen/textureLoad/ecc823.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d<rgba16uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d<rgba16uint, read>, coords: vec2<i32>) -> vec4<u32>
-fn textureLoad_ecc823() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_ecc823();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_ecc823();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_ecc823();
-}
diff --git a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.hlsl
deleted file mode 100644
index 7de5289fef..0000000000
--- a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/ecc823.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-Texture2D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_ecc823() {
-  uint4 res = arg_0.Load(int3(0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_ecc823();
-  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() {
-  textureLoad_ecc823();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_ecc823();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.msl
deleted file mode 100644
index aa4566049f..0000000000
--- a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/ecc823.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_ecc823(texture2d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()));
-}
-
-float4 vertex_main_inner(texture2d<uint, access::read> tint_symbol_2) {
-  textureLoad_ecc823(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_ecc823(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_ecc823(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.spvasm
deleted file mode 100644
index 8ca180a268..0000000000
--- a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/ecc823.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_ecc823 "textureLoad_ecc823"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v2int = OpTypeVector %int 2
-         %22 = OpConstantNull %v2int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_ecc823 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_ecc823
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_ecc823
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_ecc823
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.wgsl
deleted file mode 100644
index 51c5d2d5d1..0000000000
--- a/test/intrinsics/gen/textureLoad/ecc823.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/ecc823.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d<rgba16uint, read>;
-
-fn textureLoad_ecc823() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_ecc823();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_ecc823();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_ecc823();
-}
diff --git a/test/intrinsics/gen/textureLoad/ef5405.wgsl b/test/intrinsics/gen/textureLoad/ef5405.wgsl
deleted file mode 100644
index 8b7472e7e2..0000000000
--- a/test/intrinsics/gen/textureLoad/ef5405.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rg32uint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rg32uint, read>, coords: vec3<i32>) -> vec4<u32>
-fn textureLoad_ef5405() {
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_ef5405();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_ef5405();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_ef5405();
-}
diff --git a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.hlsl
deleted file mode 100644
index 6d34276b0f..0000000000
--- a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/ef5405.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_ef5405() {
-  uint4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_ef5405();
-  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() {
-  textureLoad_ef5405();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_ef5405();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.msl
deleted file mode 100644
index b7daadb0d3..0000000000
--- a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/ef5405.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_ef5405(texture3d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureLoad_ef5405(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_ef5405(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_ef5405(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.spvasm
deleted file mode 100644
index fab31d8555..0000000000
--- a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-intrinsics/gen/textureLoad/ef5405.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_ef5405 "textureLoad_ef5405"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %22 = OpConstantNull %v3int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_ef5405 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_ef5405
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_ef5405
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_ef5405
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.wgsl
deleted file mode 100644
index 2e4fd2e897..0000000000
--- a/test/intrinsics/gen/textureLoad/ef5405.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/ef5405.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rg32uint, read>;
-
-fn textureLoad_ef5405() {
-  var res : vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_ef5405();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_ef5405();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_ef5405();
-}
diff --git a/test/intrinsics/gen/textureLoad/f06b69.wgsl b/test/intrinsics/gen/textureLoad/f06b69.wgsl
deleted file mode 100644
index 972368c258..0000000000
--- a/test/intrinsics/gen/textureLoad/f06b69.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<r32sint, read>;
-
-// fn textureLoad(texture: texture_storage_1d<r32sint, read>, coords: i32) -> vec4<i32>
-fn textureLoad_f06b69() {
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f06b69();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f06b69();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f06b69();
-}
diff --git a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.hlsl
deleted file mode 100644
index 2cd781d47a..0000000000
--- a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/f06b69.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<int4> arg_0 : register(t0, space1);
-
-void textureLoad_f06b69() {
-  int4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_f06b69();
-  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() {
-  textureLoad_f06b69();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_f06b69();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.msl
deleted file mode 100644
index b78e551c27..0000000000
--- a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/f06b69.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_f06b69(texture1d<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<int, access::read> tint_symbol_2) {
-  textureLoad_f06b69(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_f06b69(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_f06b69(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.spvasm
deleted file mode 100644
index 8727b36dc6..0000000000
--- a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/f06b69.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_f06b69 "textureLoad_f06b69"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 1D 0 0 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %23 = OpConstantNull %v4int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_f06b69 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %23
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %int_1
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureLoad_f06b69
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureLoad_f06b69
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_f06b69
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.wgsl
deleted file mode 100644
index 299c801176..0000000000
--- a/test/intrinsics/gen/textureLoad/f06b69.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/f06b69.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<r32sint, read>;
-
-fn textureLoad_f06b69() {
-  var res : vec4<i32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f06b69();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f06b69();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f06b69();
-}
diff --git a/test/intrinsics/gen/textureLoad/f379e2.wgsl b/test/intrinsics/gen/textureLoad/f379e2.wgsl
deleted file mode 100644
index 5d26580947..0000000000
--- a/test/intrinsics/gen/textureLoad/f379e2.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8unorm, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba8unorm, read>, coords: vec2<i32>, array_index: i32) -> vec4<f32>
-fn textureLoad_f379e2() {
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f379e2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f379e2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f379e2();
-}
diff --git a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.hlsl
deleted file mode 100644
index d627536715..0000000000
--- a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/f379e2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureLoad_f379e2() {
-  float4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_f379e2();
-  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() {
-  textureLoad_f379e2();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_f379e2();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.msl
deleted file mode 100644
index 49dd335fa1..0000000000
--- a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/f379e2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_f379e2(texture2d_array<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureLoad_f379e2(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_f379e2(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_f379e2(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.spvasm
deleted file mode 100644
index 34ed2d088b..0000000000
--- a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.spvasm
+++ /dev/null
@@ -1,81 +0,0 @@
-intrinsics/gen/textureLoad/f379e2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_f379e2 "textureLoad_f379e2"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %22 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_f379e2 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %22
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureLoad_f379e2
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_f379e2
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_f379e2
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.wgsl
deleted file mode 100644
index 740cea7ee8..0000000000
--- a/test/intrinsics/gen/textureLoad/f379e2.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/f379e2.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8unorm, read>;
-
-fn textureLoad_f379e2() {
-  var res : vec4<f32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f379e2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f379e2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f379e2();
-}
diff --git a/test/intrinsics/gen/textureLoad/f56e6f.wgsl b/test/intrinsics/gen/textureLoad/f56e6f.wgsl
deleted file mode 100644
index 2e8e6f2ba6..0000000000
--- a/test/intrinsics/gen/textureLoad/f56e6f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba16uint, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba16uint, read>, coords: vec3<i32>) -> vec4<u32>
-fn textureLoad_f56e6f() {
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f56e6f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f56e6f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f56e6f();
-}
diff --git a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.hlsl
deleted file mode 100644
index ad6c64a3c3..0000000000
--- a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/f56e6f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_f56e6f() {
-  uint4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_f56e6f();
-  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() {
-  textureLoad_f56e6f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_f56e6f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.msl
deleted file mode 100644
index 65ec0aaa96..0000000000
--- a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/f56e6f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_f56e6f(texture3d<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<uint, access::read> tint_symbol_2) {
-  textureLoad_f56e6f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_f56e6f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_f56e6f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.spvasm
deleted file mode 100644
index b799f3d3b5..0000000000
--- a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,82 +0,0 @@
-intrinsics/gen/textureLoad/f56e6f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 40
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_f56e6f "textureLoad_f56e6f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %22 = OpConstantNull %v3int
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %25 = OpConstantNull %v4uint
-         %26 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_f56e6f = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %25
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %22
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %26
-         %28 = OpLabel
-         %29 = OpFunctionCall %void %textureLoad_f56e6f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %31 = OpLabel
-         %32 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %32
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_f56e6f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %38 = OpLabel
-         %39 = OpFunctionCall %void %textureLoad_f56e6f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.wgsl
deleted file mode 100644
index 7052d414d4..0000000000
--- a/test/intrinsics/gen/textureLoad/f56e6f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/f56e6f.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba16uint, read>;
-
-fn textureLoad_f56e6f() {
-  var res : vec4<u32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f56e6f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f56e6f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f56e6f();
-}
diff --git a/test/intrinsics/gen/textureLoad/f74bd8.wgsl b/test/intrinsics/gen/textureLoad/f74bd8.wgsl
deleted file mode 100644
index 68b164a343..0000000000
--- a/test/intrinsics/gen/textureLoad/f74bd8.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rg32float, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rg32float, read>, coords: vec3<i32>) -> vec4<f32>
-fn textureLoad_f74bd8() {
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f74bd8();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f74bd8();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f74bd8();
-}
diff --git a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.hlsl
deleted file mode 100644
index c947f5099f..0000000000
--- a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/f74bd8.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_f74bd8() {
-  float4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_f74bd8();
-  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() {
-  textureLoad_f74bd8();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_f74bd8();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.msl
deleted file mode 100644
index f43f9b5652..0000000000
--- a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/f74bd8.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_f74bd8(texture3d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureLoad_f74bd8(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_f74bd8(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_f74bd8(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.spvasm
deleted file mode 100644
index ccd5ab3d50..0000000000
--- a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.spvasm
+++ /dev/null
@@ -1,80 +0,0 @@
-intrinsics/gen/textureLoad/f74bd8.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_f74bd8 "textureLoad_f74bd8"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %20 = OpConstantNull %v3int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_f74bd8 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_f74bd8
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_f74bd8
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_f74bd8
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.wgsl
deleted file mode 100644
index 61eff7697d..0000000000
--- a/test/intrinsics/gen/textureLoad/f74bd8.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/f74bd8.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rg32float, read>;
-
-fn textureLoad_f74bd8() {
-  var res : vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_f74bd8();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_f74bd8();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_f74bd8();
-}
diff --git a/test/intrinsics/gen/textureLoad/fc6d36.wgsl b/test/intrinsics/gen/textureLoad/fc6d36.wgsl
deleted file mode 100644
index d6565b1dcd..0000000000
--- a/test/intrinsics/gen/textureLoad/fc6d36.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16sint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba16sint, read>, coords: vec2<i32>, array_index: i32) -> vec4<i32>
-fn textureLoad_fc6d36() {
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_fc6d36();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_fc6d36();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_fc6d36();
-}
diff --git a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.hlsl
deleted file mode 100644
index f1ebea1033..0000000000
--- a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/fc6d36.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureLoad_fc6d36() {
-  int4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_fc6d36();
-  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() {
-  textureLoad_fc6d36();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_fc6d36();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.msl
deleted file mode 100644
index 26b5c46308..0000000000
--- a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/fc6d36.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_fc6d36(texture2d_array<int, access::read> tint_symbol_1) {
-  int4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureLoad_fc6d36(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_fc6d36(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_fc6d36(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.spvasm
deleted file mode 100644
index ddd0b084b7..0000000000
--- a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.spvasm
+++ /dev/null
@@ -1,83 +0,0 @@
-intrinsics/gen/textureLoad/fc6d36.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 41
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_fc6d36 "textureLoad_fc6d36"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v4int = OpTypeVector %int 4
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %23 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-         %26 = OpConstantNull %v4int
-         %27 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_fc6d36 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4int Function %26
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4int %19 %23
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %27
-         %29 = OpLabel
-         %30 = OpFunctionCall %void %textureLoad_fc6d36
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %32 = OpLabel
-         %33 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %33
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureLoad_fc6d36
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %39 = OpLabel
-         %40 = OpFunctionCall %void %textureLoad_fc6d36
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.wgsl
deleted file mode 100644
index 8f50931c10..0000000000
--- a/test/intrinsics/gen/textureLoad/fc6d36.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/fc6d36.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16sint, read>;
-
-fn textureLoad_fc6d36() {
-  var res : vec4<i32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_fc6d36();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_fc6d36();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_fc6d36();
-}
diff --git a/test/intrinsics/gen/textureLoad/fdebd0.wgsl b/test/intrinsics/gen/textureLoad/fdebd0.wgsl
deleted file mode 100644
index 74670333e1..0000000000
--- a/test/intrinsics/gen/textureLoad/fdebd0.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8uint, read>;
-
-// fn textureLoad(texture: texture_storage_2d_array<rgba8uint, read>, coords: vec2<i32>, array_index: i32) -> vec4<u32>
-fn textureLoad_fdebd0() {
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_fdebd0();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_fdebd0();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_fdebd0();
-}
diff --git a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.hlsl
deleted file mode 100644
index 03f5160fd9..0000000000
--- a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/fdebd0.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureLoad_fdebd0() {
-  uint4 res = arg_0.Load(int4(0, 0, 1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_fdebd0();
-  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() {
-  textureLoad_fdebd0();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_fdebd0();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.msl
deleted file mode 100644
index 22b0fb9ba7..0000000000
--- a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/fdebd0.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_fdebd0(texture2d_array<uint, access::read> tint_symbol_1) {
-  uint4 res = tint_symbol_1.read(uint2(int2()), 1);
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureLoad_fdebd0(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_fdebd0(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_fdebd0(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.spvasm
deleted file mode 100644
index ec95e856c8..0000000000
--- a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.spvasm
+++ /dev/null
@@ -1,84 +0,0 @@
-intrinsics/gen/textureLoad/fdebd0.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 42
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_fdebd0 "textureLoad_fdebd0"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-     %v4uint = OpTypeVector %uint 4
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-      %int_0 = OpConstant %int 0
-      %int_1 = OpConstant %int 1
-         %24 = OpConstantComposite %v3int %int_0 %int_0 %int_1
-%_ptr_Function_v4uint = OpTypePointer Function %v4uint
-         %27 = OpConstantNull %v4uint
-         %28 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_fdebd0 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_v4uint Function %27
-         %19 = OpLoad %11 %arg_0
-         %17 = OpImageRead %v4uint %19 %24
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %28
-         %30 = OpLabel
-         %31 = OpFunctionCall %void %textureLoad_fdebd0
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %34
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureLoad_fdebd0
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %40 = OpLabel
-         %41 = OpFunctionCall %void %textureLoad_fdebd0
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.wgsl
deleted file mode 100644
index 8f27cbbb3a..0000000000
--- a/test/intrinsics/gen/textureLoad/fdebd0.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/fdebd0.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8uint, read>;
-
-fn textureLoad_fdebd0() {
-  var res : vec4<u32> = textureLoad(arg_0, vec2<i32>(), 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_fdebd0();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_fdebd0();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_fdebd0();
-}
diff --git a/test/intrinsics/gen/textureLoad/fe222a.wgsl b/test/intrinsics/gen/textureLoad/fe222a.wgsl
deleted file mode 100644
index 53a65e7a63..0000000000
--- a/test/intrinsics/gen/textureLoad/fe222a.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_1d<rgba8snorm, read>;
-
-// fn textureLoad(texture: texture_storage_1d<rgba8snorm, read>, coords: i32) -> vec4<f32>
-fn textureLoad_fe222a() {
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_fe222a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_fe222a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_fe222a();
-}
diff --git a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.hlsl
deleted file mode 100644
index 7ce653e2fa..0000000000
--- a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/fe222a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-Texture1D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_fe222a() {
-  float4 res = arg_0.Load(int2(1, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_fe222a();
-  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() {
-  textureLoad_fe222a();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_fe222a();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.msl
deleted file mode 100644
index c8f043e377..0000000000
--- a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/fe222a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_fe222a(texture1d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint(1));
-}
-
-float4 vertex_main_inner(texture1d<float, access::read> tint_symbol_2) {
-  textureLoad_fe222a(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture1d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture1d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_fe222a(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture1d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_fe222a(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.spvasm
deleted file mode 100644
index 87daa2f827..0000000000
--- a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/fe222a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 36
-; Schema: 0
-               OpCapability Shader
-               OpCapability Image1D
-               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 %arg_0 "arg_0"
-               OpName %textureLoad_fe222a "textureLoad_fe222a"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %int_1 = OpConstant %int 1
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %22 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_fe222a = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %int_1
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %22
-         %24 = OpLabel
-         %25 = OpFunctionCall %void %textureLoad_fe222a
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %27 = OpLabel
-         %28 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %28
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %31 = OpLabel
-         %32 = OpFunctionCall %void %textureLoad_fe222a
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureLoad_fe222a
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.wgsl
deleted file mode 100644
index 3e6dd4602a..0000000000
--- a/test/intrinsics/gen/textureLoad/fe222a.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/fe222a.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, 1);
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_1d<rgba8snorm, read>;
-
-fn textureLoad_fe222a() {
-  var res : vec4<f32> = textureLoad(arg_0, 1);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_fe222a();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_fe222a();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_fe222a();
-}
diff --git a/test/intrinsics/gen/textureLoad/feab99.wgsl b/test/intrinsics/gen/textureLoad/feab99.wgsl
deleted file mode 100644
index 96de94c1fb..0000000000
--- a/test/intrinsics/gen/textureLoad/feab99.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_3d<rgba16float, read>;
-
-// fn textureLoad(texture: texture_storage_3d<rgba16float, read>, coords: vec3<i32>) -> vec4<f32>
-fn textureLoad_feab99() {
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_feab99();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_feab99();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_feab99();
-}
diff --git a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.hlsl b/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.hlsl
deleted file mode 100644
index c5f126d9ab..0000000000
--- a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.hlsl
+++ /dev/null
@@ -1,36 +0,0 @@
-intrinsics/gen/textureLoad/feab99.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-Texture3D<float4> arg_0 : register(t0, space1);
-
-void textureLoad_feab99() {
-  float4 res = arg_0.Load(int4(0, 0, 0, 0));
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureLoad_feab99();
-  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() {
-  textureLoad_feab99();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureLoad_feab99();
-  return;
-}
diff --git a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.msl b/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.msl
deleted file mode 100644
index 187869ce4d..0000000000
--- a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.msl
+++ /dev/null
@@ -1,37 +0,0 @@
-intrinsics/gen/textureLoad/feab99.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureLoad_feab99(texture3d<float, access::read> tint_symbol_1) {
-  float4 res = tint_symbol_1.read(uint3(int3()));
-}
-
-float4 vertex_main_inner(texture3d<float, access::read> tint_symbol_2) {
-  textureLoad_feab99(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture3d<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture3d<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureLoad_feab99(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture3d<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureLoad_feab99(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.spvasm b/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.spvasm
deleted file mode 100644
index 618321d583..0000000000
--- a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-intrinsics/gen/textureLoad/feab99.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 37
-; 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 %arg_0 "arg_0"
-               OpName %textureLoad_feab99 "textureLoad_feab99"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-         %20 = OpConstantNull %v3int
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-         %23 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureLoad_feab99 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_v4float Function %5
-         %17 = OpLoad %11 %arg_0
-         %16 = OpImageRead %v4float %17 %20
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %23
-         %25 = OpLabel
-         %26 = OpFunctionCall %void %textureLoad_feab99
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %28 = OpLabel
-         %29 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %29
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %32 = OpLabel
-         %33 = OpFunctionCall %void %textureLoad_feab99
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %35 = OpLabel
-         %36 = OpFunctionCall %void %textureLoad_feab99
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.wgsl
deleted file mode 100644
index 3e0cb12fc2..0000000000
--- a/test/intrinsics/gen/textureLoad/feab99.wgsl.expected.wgsl
+++ /dev/null
@@ -1,25 +0,0 @@
-intrinsics/gen/textureLoad/feab99.wgsl:29:24 warning: use of deprecated intrinsic
-  var res: vec4<f32> = textureLoad(arg_0, vec3<i32>());
-                       ^^^^^^^^^^^
-
-[[group(1), binding(0)]] var arg_0 : texture_storage_3d<rgba16float, read>;
-
-fn textureLoad_feab99() {
-  var res : vec4<f32> = textureLoad(arg_0, vec3<i32>());
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureLoad_feab99();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureLoad_feab99();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureLoad_feab99();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl b/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl
deleted file mode 100644
index e73cdd69c7..0000000000
--- a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32uint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<r32uint, read>) -> i32
-fn textureNumLayers_2f6bb3() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_2f6bb3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_2f6bb3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_2f6bb3();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.hlsl
deleted file mode 100644
index 70f4f8ec98..0000000000
--- a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureNumLayers_2f6bb3() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_2f6bb3();
-  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() {
-  textureNumLayers_2f6bb3();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_2f6bb3();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.msl
deleted file mode 100644
index 640988f185..0000000000
--- a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_2f6bb3(texture2d_array<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureNumLayers_2f6bb3(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_2f6bb3(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_2f6bb3(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.spvasm
deleted file mode 100644
index dc0fae5ae5..0000000000
--- a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_2f6bb3 "textureNumLayers_2f6bb3"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 R32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %24 = OpConstantNull %int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_2f6bb3 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpCompositeExtract %int %19 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureNumLayers_2f6bb3
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureNumLayers_2f6bb3
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureNumLayers_2f6bb3
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.wgsl
deleted file mode 100644
index 9819e7372b..0000000000
--- a/test/intrinsics/gen/textureNumLayers/2f6bb3.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32uint, read>;
-
-fn textureNumLayers_2f6bb3() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_2f6bb3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_2f6bb3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_2f6bb3();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/315298.wgsl b/test/intrinsics/gen/textureNumLayers/315298.wgsl
deleted file mode 100644
index 771b517d62..0000000000
--- a/test/intrinsics/gen/textureNumLayers/315298.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32sint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba32sint, read>) -> i32
-fn textureNumLayers_315298() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_315298();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_315298();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_315298();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.hlsl
deleted file mode 100644
index 9b0e9fe71c..0000000000
--- a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureNumLayers_315298() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_315298();
-  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() {
-  textureNumLayers_315298();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_315298();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.msl
deleted file mode 100644
index 38ba74676c..0000000000
--- a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_315298(texture2d_array<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureNumLayers_315298(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_315298(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_315298(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.spvasm
deleted file mode 100644
index a238b9c96d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_315298 "textureNumLayers_315298"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_315298 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %17 = OpCompositeExtract %int %18 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_315298
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_315298
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_315298
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.wgsl
deleted file mode 100644
index f470336f78..0000000000
--- a/test/intrinsics/gen/textureNumLayers/315298.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32sint, read>;
-
-fn textureNumLayers_315298() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_315298();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_315298();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_315298();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl b/test/intrinsics/gen/textureNumLayers/3615e3.wgsl
deleted file mode 100644
index 98ce940464..0000000000
--- a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8sint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba8sint, read>) -> i32
-fn textureNumLayers_3615e3() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_3615e3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_3615e3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_3615e3();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.hlsl
deleted file mode 100644
index 2624175ac0..0000000000
--- a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureNumLayers_3615e3() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_3615e3();
-  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() {
-  textureNumLayers_3615e3();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_3615e3();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.msl
deleted file mode 100644
index bf81a1cfb6..0000000000
--- a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_3615e3(texture2d_array<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureNumLayers_3615e3(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_3615e3(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_3615e3(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.spvasm
deleted file mode 100644
index 12ea13065a..0000000000
--- a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_3615e3 "textureNumLayers_3615e3"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_3615e3 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %17 = OpCompositeExtract %int %18 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_3615e3
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_3615e3
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_3615e3
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.wgsl
deleted file mode 100644
index e12531dfe9..0000000000
--- a/test/intrinsics/gen/textureNumLayers/3615e3.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8sint, read>;
-
-fn textureNumLayers_3615e3() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_3615e3();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_3615e3();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_3615e3();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl b/test/intrinsics/gen/textureNumLayers/390fd5.wgsl
deleted file mode 100644
index b92646f001..0000000000
--- a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8uint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba8uint, read>) -> i32
-fn textureNumLayers_390fd5() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_390fd5();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_390fd5();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_390fd5();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.hlsl
deleted file mode 100644
index 42f4d8c75c..0000000000
--- a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureNumLayers_390fd5() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_390fd5();
-  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() {
-  textureNumLayers_390fd5();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_390fd5();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.msl
deleted file mode 100644
index c2b9c83446..0000000000
--- a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_390fd5(texture2d_array<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureNumLayers_390fd5(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_390fd5(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_390fd5(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.spvasm
deleted file mode 100644
index 01c522cc0d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_390fd5 "textureNumLayers_390fd5"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %24 = OpConstantNull %int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_390fd5 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpCompositeExtract %int %19 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureNumLayers_390fd5
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureNumLayers_390fd5
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureNumLayers_390fd5
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.wgsl
deleted file mode 100644
index 7ddf07dc44..0000000000
--- a/test/intrinsics/gen/textureNumLayers/390fd5.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8uint, read>;
-
-fn textureNumLayers_390fd5() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_390fd5();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_390fd5();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_390fd5();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/45155d.wgsl b/test/intrinsics/gen/textureNumLayers/45155d.wgsl
deleted file mode 100644
index a6488c21b3..0000000000
--- a/test/intrinsics/gen/textureNumLayers/45155d.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8unorm, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba8unorm, read>) -> i32
-fn textureNumLayers_45155d() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_45155d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_45155d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_45155d();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.hlsl
deleted file mode 100644
index 124ab6d8e7..0000000000
--- a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureNumLayers_45155d() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_45155d();
-  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() {
-  textureNumLayers_45155d();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_45155d();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.msl
deleted file mode 100644
index 552499b16a..0000000000
--- a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_45155d(texture2d_array<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureNumLayers_45155d(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_45155d(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_45155d(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.spvasm
deleted file mode 100644
index 88f53a88ca..0000000000
--- a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_45155d "textureNumLayers_45155d"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba8
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_45155d = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %16 = OpCompositeExtract %int %18 2
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_45155d
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_45155d
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_45155d
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.wgsl
deleted file mode 100644
index 01d5bb828b..0000000000
--- a/test/intrinsics/gen/textureNumLayers/45155d.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8unorm, read>;
-
-fn textureNumLayers_45155d() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_45155d();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_45155d();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_45155d();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl b/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl
deleted file mode 100644
index 07236e22b2..0000000000
--- a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32sint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<r32sint, read>) -> i32
-fn textureNumLayers_4bf67b() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_4bf67b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_4bf67b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_4bf67b();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.hlsl
deleted file mode 100644
index 5226985298..0000000000
--- a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureNumLayers_4bf67b() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_4bf67b();
-  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() {
-  textureNumLayers_4bf67b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_4bf67b();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.msl
deleted file mode 100644
index 71df5e4ce6..0000000000
--- a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_4bf67b(texture2d_array<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureNumLayers_4bf67b(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_4bf67b(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_4bf67b(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.spvasm
deleted file mode 100644
index 6805cb6531..0000000000
--- a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_4bf67b "textureNumLayers_4bf67b"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 R32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_4bf67b = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %17 = OpCompositeExtract %int %18 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_4bf67b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_4bf67b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_4bf67b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.wgsl
deleted file mode 100644
index 41e315d769..0000000000
--- a/test/intrinsics/gen/textureNumLayers/4bf67b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32sint, read>;
-
-fn textureNumLayers_4bf67b() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_4bf67b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_4bf67b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_4bf67b();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/57092f.wgsl b/test/intrinsics/gen/textureNumLayers/57092f.wgsl
deleted file mode 100644
index a4ea240e9a..0000000000
--- a/test/intrinsics/gen/textureNumLayers/57092f.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16uint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba16uint, read>) -> i32
-fn textureNumLayers_57092f() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_57092f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_57092f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_57092f();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.hlsl
deleted file mode 100644
index f0a671feaa..0000000000
--- a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureNumLayers_57092f() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_57092f();
-  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() {
-  textureNumLayers_57092f();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_57092f();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.msl
deleted file mode 100644
index e9f9323d1d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_57092f(texture2d_array<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureNumLayers_57092f(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_57092f(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_57092f(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.spvasm
deleted file mode 100644
index ac1f09a3cd..0000000000
--- a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_57092f "textureNumLayers_57092f"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %24 = OpConstantNull %int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_57092f = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpCompositeExtract %int %19 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureNumLayers_57092f
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureNumLayers_57092f
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureNumLayers_57092f
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.wgsl
deleted file mode 100644
index c84f73ac87..0000000000
--- a/test/intrinsics/gen/textureNumLayers/57092f.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16uint, read>;
-
-fn textureNumLayers_57092f() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_57092f();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_57092f();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_57092f();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/938763.wgsl b/test/intrinsics/gen/textureNumLayers/938763.wgsl
deleted file mode 100644
index 069a1aefbe..0000000000
--- a/test/intrinsics/gen/textureNumLayers/938763.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32uint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rg32uint, read>) -> i32
-fn textureNumLayers_938763() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_938763();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_938763();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_938763();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.hlsl
deleted file mode 100644
index a55a57b086..0000000000
--- a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureNumLayers_938763() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_938763();
-  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() {
-  textureNumLayers_938763();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_938763();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.msl
deleted file mode 100644
index a085d35508..0000000000
--- a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_938763(texture2d_array<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureNumLayers_938763(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_938763(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_938763(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.spvasm
deleted file mode 100644
index 93f9c84a1c..0000000000
--- a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.spvasm
+++ /dev/null
@@ -1,79 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_938763 "textureNumLayers_938763"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %24 = OpConstantNull %int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_938763 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpCompositeExtract %int %19 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureNumLayers_938763
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureNumLayers_938763
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureNumLayers_938763
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.wgsl
deleted file mode 100644
index 71f0139bb6..0000000000
--- a/test/intrinsics/gen/textureNumLayers/938763.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32uint, read>;
-
-fn textureNumLayers_938763() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_938763();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_938763();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_938763();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl b/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl
deleted file mode 100644
index 16f2d9b610..0000000000
--- a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32float, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rg32float, read>) -> i32
-fn textureNumLayers_aa08a7() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_aa08a7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_aa08a7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_aa08a7();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.hlsl
deleted file mode 100644
index bef0612566..0000000000
--- a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureNumLayers_aa08a7() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_aa08a7();
-  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() {
-  textureNumLayers_aa08a7();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_aa08a7();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.msl
deleted file mode 100644
index c0eb7ca24d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_aa08a7(texture2d_array<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureNumLayers_aa08a7(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_aa08a7(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_aa08a7(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.spvasm
deleted file mode 100644
index 8627271ca7..0000000000
--- a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_aa08a7 "textureNumLayers_aa08a7"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rg32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_aa08a7 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %16 = OpCompositeExtract %int %18 2
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_aa08a7
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_aa08a7
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_aa08a7
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.wgsl
deleted file mode 100644
index 1ee1b49680..0000000000
--- a/test/intrinsics/gen/textureNumLayers/aa08a7.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32float, read>;
-
-fn textureNumLayers_aa08a7() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_aa08a7();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_aa08a7();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_aa08a7();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl b/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl
deleted file mode 100644
index 67d06a1b4d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rg32sint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rg32sint, read>) -> i32
-fn textureNumLayers_ab0c9b() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_ab0c9b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_ab0c9b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_ab0c9b();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.hlsl
deleted file mode 100644
index b3fde74836..0000000000
--- a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureNumLayers_ab0c9b() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_ab0c9b();
-  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() {
-  textureNumLayers_ab0c9b();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_ab0c9b();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.msl
deleted file mode 100644
index 071a9473ac..0000000000
--- a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_ab0c9b(texture2d_array<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureNumLayers_ab0c9b(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_ab0c9b(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_ab0c9b(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.spvasm
deleted file mode 100644
index fdc495af0a..0000000000
--- a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability StorageImageExtendedFormats
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_ab0c9b "textureNumLayers_ab0c9b"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rg32i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_ab0c9b = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %17 = OpCompositeExtract %int %18 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_ab0c9b
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_ab0c9b
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_ab0c9b
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.wgsl
deleted file mode 100644
index d1e46d50df..0000000000
--- a/test/intrinsics/gen/textureNumLayers/ab0c9b.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rg32sint, read>;
-
-fn textureNumLayers_ab0c9b() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_ab0c9b();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_ab0c9b();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_ab0c9b();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl b/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl
deleted file mode 100644
index 5446cae770..0000000000
--- a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32float, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba32float, read>) -> i32
-fn textureNumLayers_b8cd76() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_b8cd76();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_b8cd76();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_b8cd76();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.hlsl
deleted file mode 100644
index c99a1b30ce..0000000000
--- a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureNumLayers_b8cd76() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_b8cd76();
-  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() {
-  textureNumLayers_b8cd76();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_b8cd76();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.msl
deleted file mode 100644
index 6c00f3310e..0000000000
--- a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_b8cd76(texture2d_array<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureNumLayers_b8cd76(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_b8cd76(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_b8cd76(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.spvasm
deleted file mode 100644
index ae8ea64c8e..0000000000
--- a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_b8cd76 "textureNumLayers_b8cd76"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_b8cd76 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %16 = OpCompositeExtract %int %18 2
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_b8cd76
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_b8cd76
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_b8cd76
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.wgsl
deleted file mode 100644
index d3fbc5e474..0000000000
--- a/test/intrinsics/gen/textureNumLayers/b8cd76.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32float, read>;
-
-fn textureNumLayers_b8cd76() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_b8cd76();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_b8cd76();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_b8cd76();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl b/test/intrinsics/gen/textureNumLayers/be1d70.wgsl
deleted file mode 100644
index c8ebc8466f..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16float, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba16float, read>) -> i32
-fn textureNumLayers_be1d70() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_be1d70();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_be1d70();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_be1d70();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.hlsl
deleted file mode 100644
index 6ae1e4a9c8..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureNumLayers_be1d70() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_be1d70();
-  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() {
-  textureNumLayers_be1d70();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_be1d70();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.msl
deleted file mode 100644
index 41158ad34e..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_be1d70(texture2d_array<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureNumLayers_be1d70(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_be1d70(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_be1d70(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.spvasm
deleted file mode 100644
index 361a574f44..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_be1d70 "textureNumLayers_be1d70"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_be1d70 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %16 = OpCompositeExtract %int %18 2
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_be1d70
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_be1d70
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_be1d70
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.wgsl
deleted file mode 100644
index b6473c81d0..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be1d70.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16float, read>;
-
-fn textureNumLayers_be1d70() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_be1d70();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_be1d70();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_be1d70();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl b/test/intrinsics/gen/textureNumLayers/be3acb.wgsl
deleted file mode 100644
index 46cc31b691..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<r32float, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<r32float, read>) -> i32
-fn textureNumLayers_be3acb() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_be3acb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_be3acb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_be3acb();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.hlsl
deleted file mode 100644
index b1d63af87e..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureNumLayers_be3acb() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_be3acb();
-  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() {
-  textureNumLayers_be3acb();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_be3acb();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.msl
deleted file mode 100644
index ded07b487d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_be3acb(texture2d_array<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureNumLayers_be3acb(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_be3acb(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_be3acb(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.spvasm
deleted file mode 100644
index d4a035b0f8..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_be3acb "textureNumLayers_be3acb"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 R32f
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_be3acb = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %16 = OpCompositeExtract %int %18 2
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_be3acb
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_be3acb
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_be3acb
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.wgsl
deleted file mode 100644
index fb9d41f18f..0000000000
--- a/test/intrinsics/gen/textureNumLayers/be3acb.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<r32float, read>;
-
-fn textureNumLayers_be3acb() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_be3acb();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_be3acb();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_be3acb();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/c09917.wgsl b/test/intrinsics/gen/textureNumLayers/c09917.wgsl
deleted file mode 100644
index 915850aa1c..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c09917.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba32uint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba32uint, read>) -> i32
-fn textureNumLayers_c09917() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_c09917();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_c09917();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_c09917();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.hlsl
deleted file mode 100644
index c398bb4227..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<uint4> arg_0 : register(t0, space1);
-
-void textureNumLayers_c09917() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_c09917();
-  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() {
-  textureNumLayers_c09917();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_c09917();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.msl
deleted file mode 100644
index a56a650936..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_c09917(texture2d_array<uint, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<uint, access::read> tint_symbol_2) {
-  textureNumLayers_c09917(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<uint, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<uint, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_c09917(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<uint, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_c09917(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.spvasm
deleted file mode 100644
index 587be4bb66..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.spvasm
+++ /dev/null
@@ -1,78 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 39
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_c09917 "textureNumLayers_c09917"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-       %uint = OpTypeInt 32 0
-         %11 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %24 = OpConstantNull %int
-         %25 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_c09917 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %24
-         %21 = OpLoad %11 %arg_0
-         %19 = OpImageQuerySize %v3int %21
-         %17 = OpCompositeExtract %int %19 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %25
-         %27 = OpLabel
-         %28 = OpFunctionCall %void %textureNumLayers_c09917
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %30 = OpLabel
-         %31 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %31
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %34 = OpLabel
-         %35 = OpFunctionCall %void %textureNumLayers_c09917
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %37 = OpLabel
-         %38 = OpFunctionCall %void %textureNumLayers_c09917
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.wgsl
deleted file mode 100644
index 70de1e0071..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c09917.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba32uint, read>;
-
-fn textureNumLayers_c09917() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_c09917();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_c09917();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_c09917();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl b/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl
deleted file mode 100644
index a74a56179d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba8snorm, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba8snorm, read>) -> i32
-fn textureNumLayers_c7c7f2() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_c7c7f2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_c7c7f2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_c7c7f2();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.hlsl
deleted file mode 100644
index 23408e8c01..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<float4> arg_0 : register(t0, space1);
-
-void textureNumLayers_c7c7f2() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_c7c7f2();
-  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() {
-  textureNumLayers_c7c7f2();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_c7c7f2();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.msl
deleted file mode 100644
index 23cc7ab2d2..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_c7c7f2(texture2d_array<float, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<float, access::read> tint_symbol_2) {
-  textureNumLayers_c7c7f2(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<float, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<float, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_c7c7f2(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<float, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_c7c7f2(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.spvasm
deleted file mode 100644
index f81ec2d03d..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_c7c7f2 "textureNumLayers_c7c7f2"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-         %11 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %12 = OpTypeFunction %void
-        %int = OpTypeInt 32 1
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_c7c7f2 = OpFunction %void None %12
-         %15 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %16 = OpCompositeExtract %int %18 2
-               OpStore %res %16
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_c7c7f2
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %12
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %12
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_c7c7f2
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %12
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_c7c7f2
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.wgsl
deleted file mode 100644
index 1ec7f126e5..0000000000
--- a/test/intrinsics/gen/textureNumLayers/c7c7f2.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba8snorm, read>;
-
-fn textureNumLayers_c7c7f2() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_c7c7f2();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_c7c7f2();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_c7c7f2();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/e15642.wgsl b/test/intrinsics/gen/textureNumLayers/e15642.wgsl
deleted file mode 100644
index f54ef51a2e..0000000000
--- a/test/intrinsics/gen/textureNumLayers/e15642.wgsl
+++ /dev/null
@@ -1,46 +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/intrinsic-gen
-// using the template:
-//   test/intrinsics/intrinsics.wgsl.tmpl
-// and the intrinsic defintion file:
-//   src/intrinsics.def
-//
-// Do not modify this file directly
-////////////////////////////////////////////////////////////////////////////////
-
-[[group(1), binding(0)]] var arg_0: texture_storage_2d_array<rgba16sint, read>;
-
-// fn textureNumLayers(texture: texture_storage_2d_array<rgba16sint, read>) -> i32
-fn textureNumLayers_e15642() {
-  var res: i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_e15642();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_e15642();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_e15642();
-}
diff --git a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.hlsl b/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.hlsl
deleted file mode 100644
index 43dd45a0d3..0000000000
--- a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-Texture2DArray<int4> arg_0 : register(t0, space1);
-
-void textureNumLayers_e15642() {
-  int3 tint_tmp;
-  arg_0.GetDimensions(tint_tmp.x, tint_tmp.y, tint_tmp.z);
-  int res = tint_tmp.z;
-}
-
-struct tint_symbol {
-  float4 value : SV_Position;
-};
-
-float4 vertex_main_inner() {
-  textureNumLayers_e15642();
-  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() {
-  textureNumLayers_e15642();
-  return;
-}
-
-[numthreads(1, 1, 1)]
-void compute_main() {
-  textureNumLayers_e15642();
-  return;
-}
diff --git a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.msl b/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.msl
deleted file mode 100644
index 5b4754710f..0000000000
--- a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.msl
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <metal_stdlib>
-
-using namespace metal;
-struct tint_symbol {
-  float4 value [[position]];
-};
-
-void textureNumLayers_e15642(texture2d_array<int, access::read> tint_symbol_1) {
-  int res = int(tint_symbol_1.get_array_size());
-}
-
-float4 vertex_main_inner(texture2d_array<int, access::read> tint_symbol_2) {
-  textureNumLayers_e15642(tint_symbol_2);
-  return float4();
-}
-
-vertex tint_symbol vertex_main(texture2d_array<int, access::read> tint_symbol_3 [[texture(0)]]) {
-  float4 const inner_result = vertex_main_inner(tint_symbol_3);
-  tint_symbol wrapper_result = {};
-  wrapper_result.value = inner_result;
-  return wrapper_result;
-}
-
-fragment void fragment_main(texture2d_array<int, access::read> tint_symbol_4 [[texture(0)]]) {
-  textureNumLayers_e15642(tint_symbol_4);
-  return;
-}
-
-kernel void compute_main(texture2d_array<int, access::read> tint_symbol_5 [[texture(0)]]) {
-  textureNumLayers_e15642(tint_symbol_5);
-  return;
-}
-
diff --git a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.spvasm b/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.spvasm
deleted file mode 100644
index e164ea82ee..0000000000
--- a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.spvasm
+++ /dev/null
@@ -1,77 +0,0 @@
-; SPIR-V
-; Version: 1.3
-; Generator: Google Tint Compiler; 0
-; Bound: 38
-; Schema: 0
-               OpCapability Shader
-               OpCapability ImageQuery
-               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 %arg_0 "arg_0"
-               OpName %textureNumLayers_e15642 "textureNumLayers_e15642"
-               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
-               OpDecorate %arg_0 NonWritable
-               OpDecorate %arg_0 DescriptorSet 1
-               OpDecorate %arg_0 Binding 0
-      %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
-        %int = OpTypeInt 32 1
-         %11 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
-%_ptr_UniformConstant_11 = OpTypePointer UniformConstant %11
-      %arg_0 = OpVariable %_ptr_UniformConstant_11 UniformConstant
-       %void = OpTypeVoid
-         %13 = OpTypeFunction %void
-      %v3int = OpTypeVector %int 3
-%_ptr_Function_int = OpTypePointer Function %int
-         %23 = OpConstantNull %int
-         %24 = OpTypeFunction %v4float
-    %float_1 = OpConstant %float 1
-%textureNumLayers_e15642 = OpFunction %void None %13
-         %16 = OpLabel
-        %res = OpVariable %_ptr_Function_int Function %23
-         %20 = OpLoad %11 %arg_0
-         %18 = OpImageQuerySize %v3int %20
-         %17 = OpCompositeExtract %int %18 2
-               OpStore %res %17
-               OpReturn
-               OpFunctionEnd
-%vertex_main_inner = OpFunction %v4float None %24
-         %26 = OpLabel
-         %27 = OpFunctionCall %void %textureNumLayers_e15642
-               OpReturnValue %5
-               OpFunctionEnd
-%vertex_main = OpFunction %void None %13
-         %29 = OpLabel
-         %30 = OpFunctionCall %v4float %vertex_main_inner
-               OpStore %value %30
-               OpStore %vertex_point_size %float_1
-               OpReturn
-               OpFunctionEnd
-%fragment_main = OpFunction %void None %13
-         %33 = OpLabel
-         %34 = OpFunctionCall %void %textureNumLayers_e15642
-               OpReturn
-               OpFunctionEnd
-%compute_main = OpFunction %void None %13
-         %36 = OpLabel
-         %37 = OpFunctionCall %void %textureNumLayers_e15642
-               OpReturn
-               OpFunctionEnd
diff --git a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.wgsl b/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.wgsl
deleted file mode 100644
index aa985616df..0000000000
--- a/test/intrinsics/gen/textureNumLayers/e15642.wgsl.expected.wgsl
+++ /dev/null
@@ -1,21 +0,0 @@
-[[group(1), binding(0)]] var arg_0 : texture_storage_2d_array<rgba16sint, read>;
-
-fn textureNumLayers_e15642() {
-  var res : i32 = textureNumLayers(arg_0);
-}
-
-[[stage(vertex)]]
-fn vertex_main() -> [[builtin(position)]] vec4<f32> {
-  textureNumLayers_e15642();
-  return vec4<f32>();
-}
-
-[[stage(fragment)]]
-fn fragment_main() {
-  textureNumLayers_e15642();
-}
-
-[[stage(compute), workgroup_size(1)]]
-fn compute_main() {
-  textureNumLayers_e15642();
-}
diff --git a/test/types/texture/storage/1d.wgsl b/test/types/texture/storage/1d.wgsl
index 39afb6c397..8a0b600031 100644
--- a/test/types/texture/storage/1d.wgsl
+++ b/test/types/texture/storage/1d.wgsl
@@ -1,68 +1,36 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_1d<rgba8unorm, read>;
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_1d<rgba8snorm, read>;
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_1d<rgba8uint, read>;
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_1d<rgba8sint, read>;
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_1d<rgba16uint, read>;
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_1d<rgba16sint, read>;
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_1d<rgba16float, read>;
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_1d<r32uint, read>;
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_1d<r32sint, read>;
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_1d<r32float, read>;
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_1d<rg32uint, read>;
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_1d<rg32sint, read>;
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_1d<rg32float, read>;
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_1d<rgba32uint, read>;
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_1d<rgba32sint, read>;
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_1d<rgba32float, read>;
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_1d<rgba8unorm, write>;
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_1d<rgba8snorm, write>;
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_1d<rgba8uint, write>;
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_1d<rgba8sint, write>;
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_1d<rgba16uint, write>;
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_1d<rgba16sint, write>;
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_1d<rgba16float, write>;
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_1d<r32uint, write>;
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_1d<r32sint, write>;
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_1d<r32float, write>;
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_1d<rg32uint, write>;
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_1d<rg32sint, write>;
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_1d<rg32float, write>;
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_1d<rgba32uint, write>;
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_1d<rgba32sint, write>;
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_1d<rgba32float, write>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_1d<rgba8unorm, write>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_1d<rgba8snorm, write>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_1d<rgba8uint, write>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_1d<rgba8sint, write>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_1d<rgba16uint, write>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_1d<rgba16sint, write>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_1d<rgba16float, write>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_1d<r32uint, write>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_1d<r32sint, write>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_1d<r32float, write>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_1d<rg32uint, write>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_1d<rg32sint, write>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_1d<rg32float, write>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_1d<rgba32uint, write>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_1d<rgba32sint, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_1d<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/types/texture/storage/1d.wgsl.expected.hlsl b/test/types/texture/storage/1d.wgsl.expected.hlsl
index 2ffd86da36..8e4d6342ca 100644
--- a/test/types/texture/storage/1d.wgsl.expected.hlsl
+++ b/test/types/texture/storage/1d.wgsl.expected.hlsl
@@ -1,69 +1,37 @@
-Texture1D<float4> t_rgba8unorm_r : register(t0, space0);
-Texture1D<float4> t_rgba8snorm_r : register(t1, space0);
-Texture1D<uint4> t_rgba8uint_r : register(t2, space0);
-Texture1D<int4> t_rgba8sint_r : register(t3, space0);
-Texture1D<uint4> t_rgba16uint_r : register(t4, space0);
-Texture1D<int4> t_rgba16sint_r : register(t5, space0);
-Texture1D<float4> t_rgba16float_r : register(t6, space0);
-Texture1D<uint4> t_r32uint_r : register(t7, space0);
-Texture1D<int4> t_r32sint_r : register(t8, space0);
-Texture1D<float4> t_r32float_r : register(t9, space0);
-Texture1D<uint4> t_rg32uint_r : register(t10, space0);
-Texture1D<int4> t_rg32sint_r : register(t11, space0);
-Texture1D<float4> t_rg32float_r : register(t12, space0);
-Texture1D<uint4> t_rgba32uint_r : register(t13, space0);
-Texture1D<int4> t_rgba32sint_r : register(t14, space0);
-Texture1D<float4> t_rgba32float_r : register(t15, space0);
-RWTexture1D<float4> t_rgba8unorm_w : register(u50, space0);
-RWTexture1D<float4> t_rgba8snorm_w : register(u51, space0);
-RWTexture1D<uint4> t_rgba8uint_w : register(u52, space0);
-RWTexture1D<int4> t_rgba8sint_w : register(u53, space0);
-RWTexture1D<uint4> t_rgba16uint_w : register(u54, space0);
-RWTexture1D<int4> t_rgba16sint_w : register(u55, space0);
-RWTexture1D<float4> t_rgba16float_w : register(u56, space0);
-RWTexture1D<uint4> t_r32uint_w : register(u57, space0);
-RWTexture1D<int4> t_r32sint_w : register(u58, space0);
-RWTexture1D<float4> t_r32float_w : register(u59, space0);
-RWTexture1D<uint4> t_rg32uint_w : register(u60, space0);
-RWTexture1D<int4> t_rg32sint_w : register(u61, space0);
-RWTexture1D<float4> t_rg32float_w : register(u62, space0);
-RWTexture1D<uint4> t_rgba32uint_w : register(u63, space0);
-RWTexture1D<int4> t_rgba32sint_w : register(u64, space0);
-RWTexture1D<float4> t_rgba32float_w : register(u65, space0);
+RWTexture1D<float4> t_rgba8unorm : register(u0, space0);
+RWTexture1D<float4> t_rgba8snorm : register(u1, space0);
+RWTexture1D<uint4> t_rgba8uint : register(u2, space0);
+RWTexture1D<int4> t_rgba8sint : register(u3, space0);
+RWTexture1D<uint4> t_rgba16uint : register(u4, space0);
+RWTexture1D<int4> t_rgba16sint : register(u5, space0);
+RWTexture1D<float4> t_rgba16float : register(u6, space0);
+RWTexture1D<uint4> t_r32uint : register(u7, space0);
+RWTexture1D<int4> t_r32sint : register(u8, space0);
+RWTexture1D<float4> t_r32float : register(u9, space0);
+RWTexture1D<uint4> t_rg32uint : register(u10, space0);
+RWTexture1D<int4> t_rg32sint : register(u11, space0);
+RWTexture1D<float4> t_rg32float : register(u12, space0);
+RWTexture1D<uint4> t_rgba32uint : register(u13, space0);
+RWTexture1D<int4> t_rgba32sint : register(u14, space0);
+RWTexture1D<float4> t_rgba32float : register(u15, space0);
 
 [numthreads(1, 1, 1)]
 void main() {
-  t_rgba8unorm_r;
-  t_rgba8snorm_r;
-  t_rgba8uint_r;
-  t_rgba8sint_r;
-  t_rgba16uint_r;
-  t_rgba16sint_r;
-  t_rgba16float_r;
-  t_r32uint_r;
-  t_r32sint_r;
-  t_r32float_r;
-  t_rg32uint_r;
-  t_rg32sint_r;
-  t_rg32float_r;
-  t_rgba32uint_r;
-  t_rgba32sint_r;
-  t_rgba32float_r;
-  t_rgba8unorm_w;
-  t_rgba8snorm_w;
-  t_rgba8uint_w;
-  t_rgba8sint_w;
-  t_rgba16uint_w;
-  t_rgba16sint_w;
-  t_rgba16float_w;
-  t_r32uint_w;
-  t_r32sint_w;
-  t_r32float_w;
-  t_rg32uint_w;
-  t_rg32sint_w;
-  t_rg32float_w;
-  t_rgba32uint_w;
-  t_rgba32sint_w;
-  t_rgba32float_w;
+  t_rgba8unorm;
+  t_rgba8snorm;
+  t_rgba8uint;
+  t_rgba8sint;
+  t_rgba16uint;
+  t_rgba16sint;
+  t_rgba16float;
+  t_r32uint;
+  t_r32sint;
+  t_r32float;
+  t_rg32uint;
+  t_rg32sint;
+  t_rg32float;
+  t_rgba32uint;
+  t_rgba32sint;
+  t_rgba32float;
   return;
 }
diff --git a/test/types/texture/storage/1d.wgsl.expected.msl b/test/types/texture/storage/1d.wgsl.expected.msl
index 0c533ae2b3..48e5811e5c 100644
--- a/test/types/texture/storage/1d.wgsl.expected.msl
+++ b/test/types/texture/storage/1d.wgsl.expected.msl
@@ -1,7 +1,7 @@
 #include <metal_stdlib>
 
 using namespace metal;
-kernel void tint_symbol(texture1d<float, access::read> tint_symbol_1 [[texture(0)]], texture1d<float, access::read> tint_symbol_2 [[texture(1)]], texture1d<uint, access::read> tint_symbol_3 [[texture(2)]], texture1d<int, access::read> tint_symbol_4 [[texture(3)]], texture1d<uint, access::read> tint_symbol_5 [[texture(4)]], texture1d<int, access::read> tint_symbol_6 [[texture(5)]], texture1d<float, access::read> tint_symbol_7 [[texture(6)]], texture1d<uint, access::read> tint_symbol_8 [[texture(7)]], texture1d<int, access::read> tint_symbol_9 [[texture(8)]], texture1d<float, access::read> tint_symbol_10 [[texture(9)]], texture1d<uint, access::read> tint_symbol_11 [[texture(10)]], texture1d<int, access::read> tint_symbol_12 [[texture(11)]], texture1d<float, access::read> tint_symbol_13 [[texture(12)]], texture1d<uint, access::read> tint_symbol_14 [[texture(13)]], texture1d<int, access::read> tint_symbol_15 [[texture(14)]], texture1d<float, access::read> tint_symbol_16 [[texture(15)]], texture1d<float, access::write> tint_symbol_17 [[texture(16)]], texture1d<float, access::write> tint_symbol_18 [[texture(17)]], texture1d<uint, access::write> tint_symbol_19 [[texture(18)]], texture1d<int, access::write> tint_symbol_20 [[texture(19)]], texture1d<uint, access::write> tint_symbol_21 [[texture(20)]], texture1d<int, access::write> tint_symbol_22 [[texture(21)]], texture1d<float, access::write> tint_symbol_23 [[texture(22)]], texture1d<uint, access::write> tint_symbol_24 [[texture(23)]], texture1d<int, access::write> tint_symbol_25 [[texture(24)]], texture1d<float, access::write> tint_symbol_26 [[texture(25)]], texture1d<uint, access::write> tint_symbol_27 [[texture(26)]], texture1d<int, access::write> tint_symbol_28 [[texture(27)]], texture1d<float, access::write> tint_symbol_29 [[texture(28)]], texture1d<uint, access::write> tint_symbol_30 [[texture(29)]], texture1d<int, access::write> tint_symbol_31 [[texture(30)]], texture1d<float, access::write> tint_symbol_32 [[texture(31)]]) {
+kernel void tint_symbol(texture1d<float, access::write> tint_symbol_1 [[texture(0)]], texture1d<float, access::write> tint_symbol_2 [[texture(1)]], texture1d<uint, access::write> tint_symbol_3 [[texture(2)]], texture1d<int, access::write> tint_symbol_4 [[texture(3)]], texture1d<uint, access::write> tint_symbol_5 [[texture(4)]], texture1d<int, access::write> tint_symbol_6 [[texture(5)]], texture1d<float, access::write> tint_symbol_7 [[texture(6)]], texture1d<uint, access::write> tint_symbol_8 [[texture(7)]], texture1d<int, access::write> tint_symbol_9 [[texture(8)]], texture1d<float, access::write> tint_symbol_10 [[texture(9)]], texture1d<uint, access::write> tint_symbol_11 [[texture(10)]], texture1d<int, access::write> tint_symbol_12 [[texture(11)]], texture1d<float, access::write> tint_symbol_13 [[texture(12)]], texture1d<uint, access::write> tint_symbol_14 [[texture(13)]], texture1d<int, access::write> tint_symbol_15 [[texture(14)]], texture1d<float, access::write> tint_symbol_16 [[texture(15)]]) {
   (void) tint_symbol_1;
   (void) tint_symbol_2;
   (void) tint_symbol_3;
@@ -18,22 +18,6 @@ kernel void tint_symbol(texture1d<float, access::read> tint_symbol_1 [[texture(0
   (void) tint_symbol_14;
   (void) tint_symbol_15;
   (void) tint_symbol_16;
-  (void) tint_symbol_17;
-  (void) tint_symbol_18;
-  (void) tint_symbol_19;
-  (void) tint_symbol_20;
-  (void) tint_symbol_21;
-  (void) tint_symbol_22;
-  (void) tint_symbol_23;
-  (void) tint_symbol_24;
-  (void) tint_symbol_25;
-  (void) tint_symbol_26;
-  (void) tint_symbol_27;
-  (void) tint_symbol_28;
-  (void) tint_symbol_29;
-  (void) tint_symbol_30;
-  (void) tint_symbol_31;
-  (void) tint_symbol_32;
   return;
 }
 
diff --git a/test/types/texture/storage/1d.wgsl.expected.spvasm b/test/types/texture/storage/1d.wgsl.expected.spvasm
index 8304a15b78..23864fc0a1 100644
--- a/test/types/texture/storage/1d.wgsl.expected.spvasm
+++ b/test/types/texture/storage/1d.wgsl.expected.spvasm
@@ -1,7 +1,7 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 120
+; Bound: 72
 ; Schema: 0
                OpCapability Shader
                OpCapability Image1D
@@ -9,221 +9,125 @@
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %main "main"
                OpExecutionMode %main LocalSize 1 1 1
-               OpName %t_rgba8unorm_r "t_rgba8unorm_r"
-               OpName %t_rgba8snorm_r "t_rgba8snorm_r"
-               OpName %t_rgba8uint_r "t_rgba8uint_r"
-               OpName %t_rgba8sint_r "t_rgba8sint_r"
-               OpName %t_rgba16uint_r "t_rgba16uint_r"
-               OpName %t_rgba16sint_r "t_rgba16sint_r"
-               OpName %t_rgba16float_r "t_rgba16float_r"
-               OpName %t_r32uint_r "t_r32uint_r"
-               OpName %t_r32sint_r "t_r32sint_r"
-               OpName %t_r32float_r "t_r32float_r"
-               OpName %t_rg32uint_r "t_rg32uint_r"
-               OpName %t_rg32sint_r "t_rg32sint_r"
-               OpName %t_rg32float_r "t_rg32float_r"
-               OpName %t_rgba32uint_r "t_rgba32uint_r"
-               OpName %t_rgba32sint_r "t_rgba32sint_r"
-               OpName %t_rgba32float_r "t_rgba32float_r"
-               OpName %t_rgba8unorm_w "t_rgba8unorm_w"
-               OpName %t_rgba8snorm_w "t_rgba8snorm_w"
-               OpName %t_rgba8uint_w "t_rgba8uint_w"
-               OpName %t_rgba8sint_w "t_rgba8sint_w"
-               OpName %t_rgba16uint_w "t_rgba16uint_w"
-               OpName %t_rgba16sint_w "t_rgba16sint_w"
-               OpName %t_rgba16float_w "t_rgba16float_w"
-               OpName %t_r32uint_w "t_r32uint_w"
-               OpName %t_r32sint_w "t_r32sint_w"
-               OpName %t_r32float_w "t_r32float_w"
-               OpName %t_rg32uint_w "t_rg32uint_w"
-               OpName %t_rg32sint_w "t_rg32sint_w"
-               OpName %t_rg32float_w "t_rg32float_w"
-               OpName %t_rgba32uint_w "t_rgba32uint_w"
-               OpName %t_rgba32sint_w "t_rgba32sint_w"
-               OpName %t_rgba32float_w "t_rgba32float_w"
+               OpName %t_rgba8unorm "t_rgba8unorm"
+               OpName %t_rgba8snorm "t_rgba8snorm"
+               OpName %t_rgba8uint "t_rgba8uint"
+               OpName %t_rgba8sint "t_rgba8sint"
+               OpName %t_rgba16uint "t_rgba16uint"
+               OpName %t_rgba16sint "t_rgba16sint"
+               OpName %t_rgba16float "t_rgba16float"
+               OpName %t_r32uint "t_r32uint"
+               OpName %t_r32sint "t_r32sint"
+               OpName %t_r32float "t_r32float"
+               OpName %t_rg32uint "t_rg32uint"
+               OpName %t_rg32sint "t_rg32sint"
+               OpName %t_rg32float "t_rg32float"
+               OpName %t_rgba32uint "t_rgba32uint"
+               OpName %t_rgba32sint "t_rgba32sint"
+               OpName %t_rgba32float "t_rgba32float"
                OpName %main "main"
-               OpDecorate %t_rgba8unorm_r NonWritable
-               OpDecorate %t_rgba8unorm_r DescriptorSet 0
-               OpDecorate %t_rgba8unorm_r Binding 0
-               OpDecorate %t_rgba8snorm_r NonWritable
-               OpDecorate %t_rgba8snorm_r DescriptorSet 0
-               OpDecorate %t_rgba8snorm_r Binding 1
-               OpDecorate %t_rgba8uint_r NonWritable
-               OpDecorate %t_rgba8uint_r DescriptorSet 0
-               OpDecorate %t_rgba8uint_r Binding 2
-               OpDecorate %t_rgba8sint_r NonWritable
-               OpDecorate %t_rgba8sint_r DescriptorSet 0
-               OpDecorate %t_rgba8sint_r Binding 3
-               OpDecorate %t_rgba16uint_r NonWritable
-               OpDecorate %t_rgba16uint_r DescriptorSet 0
-               OpDecorate %t_rgba16uint_r Binding 4
-               OpDecorate %t_rgba16sint_r NonWritable
-               OpDecorate %t_rgba16sint_r DescriptorSet 0
-               OpDecorate %t_rgba16sint_r Binding 5
-               OpDecorate %t_rgba16float_r NonWritable
-               OpDecorate %t_rgba16float_r DescriptorSet 0
-               OpDecorate %t_rgba16float_r Binding 6
-               OpDecorate %t_r32uint_r NonWritable
-               OpDecorate %t_r32uint_r DescriptorSet 0
-               OpDecorate %t_r32uint_r Binding 7
-               OpDecorate %t_r32sint_r NonWritable
-               OpDecorate %t_r32sint_r DescriptorSet 0
-               OpDecorate %t_r32sint_r Binding 8
-               OpDecorate %t_r32float_r NonWritable
-               OpDecorate %t_r32float_r DescriptorSet 0
-               OpDecorate %t_r32float_r Binding 9
-               OpDecorate %t_rg32uint_r NonWritable
-               OpDecorate %t_rg32uint_r DescriptorSet 0
-               OpDecorate %t_rg32uint_r Binding 10
-               OpDecorate %t_rg32sint_r NonWritable
-               OpDecorate %t_rg32sint_r DescriptorSet 0
-               OpDecorate %t_rg32sint_r Binding 11
-               OpDecorate %t_rg32float_r NonWritable
-               OpDecorate %t_rg32float_r DescriptorSet 0
-               OpDecorate %t_rg32float_r Binding 12
-               OpDecorate %t_rgba32uint_r NonWritable
-               OpDecorate %t_rgba32uint_r DescriptorSet 0
-               OpDecorate %t_rgba32uint_r Binding 13
-               OpDecorate %t_rgba32sint_r NonWritable
-               OpDecorate %t_rgba32sint_r DescriptorSet 0
-               OpDecorate %t_rgba32sint_r Binding 14
-               OpDecorate %t_rgba32float_r NonWritable
-               OpDecorate %t_rgba32float_r DescriptorSet 0
-               OpDecorate %t_rgba32float_r Binding 15
-               OpDecorate %t_rgba8unorm_w NonReadable
-               OpDecorate %t_rgba8unorm_w DescriptorSet 0
-               OpDecorate %t_rgba8unorm_w Binding 50
-               OpDecorate %t_rgba8snorm_w NonReadable
-               OpDecorate %t_rgba8snorm_w DescriptorSet 0
-               OpDecorate %t_rgba8snorm_w Binding 51
-               OpDecorate %t_rgba8uint_w NonReadable
-               OpDecorate %t_rgba8uint_w DescriptorSet 0
-               OpDecorate %t_rgba8uint_w Binding 52
-               OpDecorate %t_rgba8sint_w NonReadable
-               OpDecorate %t_rgba8sint_w DescriptorSet 0
-               OpDecorate %t_rgba8sint_w Binding 53
-               OpDecorate %t_rgba16uint_w NonReadable
-               OpDecorate %t_rgba16uint_w DescriptorSet 0
-               OpDecorate %t_rgba16uint_w Binding 54
-               OpDecorate %t_rgba16sint_w NonReadable
-               OpDecorate %t_rgba16sint_w DescriptorSet 0
-               OpDecorate %t_rgba16sint_w Binding 55
-               OpDecorate %t_rgba16float_w NonReadable
-               OpDecorate %t_rgba16float_w DescriptorSet 0
-               OpDecorate %t_rgba16float_w Binding 56
-               OpDecorate %t_r32uint_w NonReadable
-               OpDecorate %t_r32uint_w DescriptorSet 0
-               OpDecorate %t_r32uint_w Binding 57
-               OpDecorate %t_r32sint_w NonReadable
-               OpDecorate %t_r32sint_w DescriptorSet 0
-               OpDecorate %t_r32sint_w Binding 58
-               OpDecorate %t_r32float_w NonReadable
-               OpDecorate %t_r32float_w DescriptorSet 0
-               OpDecorate %t_r32float_w Binding 59
-               OpDecorate %t_rg32uint_w NonReadable
-               OpDecorate %t_rg32uint_w DescriptorSet 0
-               OpDecorate %t_rg32uint_w Binding 60
-               OpDecorate %t_rg32sint_w NonReadable
-               OpDecorate %t_rg32sint_w DescriptorSet 0
-               OpDecorate %t_rg32sint_w Binding 61
-               OpDecorate %t_rg32float_w NonReadable
-               OpDecorate %t_rg32float_w DescriptorSet 0
-               OpDecorate %t_rg32float_w Binding 62
-               OpDecorate %t_rgba32uint_w NonReadable
-               OpDecorate %t_rgba32uint_w DescriptorSet 0
-               OpDecorate %t_rgba32uint_w Binding 63
-               OpDecorate %t_rgba32sint_w NonReadable
-               OpDecorate %t_rgba32sint_w DescriptorSet 0
-               OpDecorate %t_rgba32sint_w Binding 64
-               OpDecorate %t_rgba32float_w NonReadable
-               OpDecorate %t_rgba32float_w DescriptorSet 0
-               OpDecorate %t_rgba32float_w Binding 65
+               OpDecorate %t_rgba8unorm NonReadable
+               OpDecorate %t_rgba8unorm DescriptorSet 0
+               OpDecorate %t_rgba8unorm Binding 0
+               OpDecorate %t_rgba8snorm NonReadable
+               OpDecorate %t_rgba8snorm DescriptorSet 0
+               OpDecorate %t_rgba8snorm Binding 1
+               OpDecorate %t_rgba8uint NonReadable
+               OpDecorate %t_rgba8uint DescriptorSet 0
+               OpDecorate %t_rgba8uint Binding 2
+               OpDecorate %t_rgba8sint NonReadable
+               OpDecorate %t_rgba8sint DescriptorSet 0
+               OpDecorate %t_rgba8sint Binding 3
+               OpDecorate %t_rgba16uint NonReadable
+               OpDecorate %t_rgba16uint DescriptorSet 0
+               OpDecorate %t_rgba16uint Binding 4
+               OpDecorate %t_rgba16sint NonReadable
+               OpDecorate %t_rgba16sint DescriptorSet 0
+               OpDecorate %t_rgba16sint Binding 5
+               OpDecorate %t_rgba16float NonReadable
+               OpDecorate %t_rgba16float DescriptorSet 0
+               OpDecorate %t_rgba16float Binding 6
+               OpDecorate %t_r32uint NonReadable
+               OpDecorate %t_r32uint DescriptorSet 0
+               OpDecorate %t_r32uint Binding 7
+               OpDecorate %t_r32sint NonReadable
+               OpDecorate %t_r32sint DescriptorSet 0
+               OpDecorate %t_r32sint Binding 8
+               OpDecorate %t_r32float NonReadable
+               OpDecorate %t_r32float DescriptorSet 0
+               OpDecorate %t_r32float Binding 9
+               OpDecorate %t_rg32uint NonReadable
+               OpDecorate %t_rg32uint DescriptorSet 0
+               OpDecorate %t_rg32uint Binding 10
+               OpDecorate %t_rg32sint NonReadable
+               OpDecorate %t_rg32sint DescriptorSet 0
+               OpDecorate %t_rg32sint Binding 11
+               OpDecorate %t_rg32float NonReadable
+               OpDecorate %t_rg32float DescriptorSet 0
+               OpDecorate %t_rg32float Binding 12
+               OpDecorate %t_rgba32uint NonReadable
+               OpDecorate %t_rgba32uint DescriptorSet 0
+               OpDecorate %t_rgba32uint Binding 13
+               OpDecorate %t_rgba32sint NonReadable
+               OpDecorate %t_rgba32sint DescriptorSet 0
+               OpDecorate %t_rgba32sint Binding 14
+               OpDecorate %t_rgba32float NonReadable
+               OpDecorate %t_rgba32float DescriptorSet 0
+               OpDecorate %t_rgba32float Binding 15
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 1D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_r = OpVariable %_ptr_UniformConstant_3 UniformConstant
+%t_rgba8unorm = OpVariable %_ptr_UniformConstant_3 UniformConstant
           %7 = OpTypeImage %float 1D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_r = OpVariable %_ptr_UniformConstant_7 UniformConstant
+%t_rgba8snorm = OpVariable %_ptr_UniformConstant_7 UniformConstant
        %uint = OpTypeInt 32 0
          %10 = OpTypeImage %uint 1D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_10 = OpTypePointer UniformConstant %10
-%t_rgba8uint_r = OpVariable %_ptr_UniformConstant_10 UniformConstant
+%t_rgba8uint = OpVariable %_ptr_UniformConstant_10 UniformConstant
         %int = OpTypeInt 32 1
          %14 = OpTypeImage %int 1D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_14 = OpTypePointer UniformConstant %14
-%t_rgba8sint_r = OpVariable %_ptr_UniformConstant_14 UniformConstant
+%t_rgba8sint = OpVariable %_ptr_UniformConstant_14 UniformConstant
          %18 = OpTypeImage %uint 1D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_18 = OpTypePointer UniformConstant %18
-%t_rgba16uint_r = OpVariable %_ptr_UniformConstant_18 UniformConstant
+%t_rgba16uint = OpVariable %_ptr_UniformConstant_18 UniformConstant
          %21 = OpTypeImage %int 1D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_21 = OpTypePointer UniformConstant %21
-%t_rgba16sint_r = OpVariable %_ptr_UniformConstant_21 UniformConstant
+%t_rgba16sint = OpVariable %_ptr_UniformConstant_21 UniformConstant
          %24 = OpTypeImage %float 1D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_24 = OpTypePointer UniformConstant %24
-%t_rgba16float_r = OpVariable %_ptr_UniformConstant_24 UniformConstant
+%t_rgba16float = OpVariable %_ptr_UniformConstant_24 UniformConstant
          %27 = OpTypeImage %uint 1D 0 0 0 2 R32ui
 %_ptr_UniformConstant_27 = OpTypePointer UniformConstant %27
-%t_r32uint_r = OpVariable %_ptr_UniformConstant_27 UniformConstant
+  %t_r32uint = OpVariable %_ptr_UniformConstant_27 UniformConstant
          %30 = OpTypeImage %int 1D 0 0 0 2 R32i
 %_ptr_UniformConstant_30 = OpTypePointer UniformConstant %30
-%t_r32sint_r = OpVariable %_ptr_UniformConstant_30 UniformConstant
+  %t_r32sint = OpVariable %_ptr_UniformConstant_30 UniformConstant
          %33 = OpTypeImage %float 1D 0 0 0 2 R32f
 %_ptr_UniformConstant_33 = OpTypePointer UniformConstant %33
-%t_r32float_r = OpVariable %_ptr_UniformConstant_33 UniformConstant
+ %t_r32float = OpVariable %_ptr_UniformConstant_33 UniformConstant
          %36 = OpTypeImage %uint 1D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_36 = OpTypePointer UniformConstant %36
-%t_rg32uint_r = OpVariable %_ptr_UniformConstant_36 UniformConstant
+ %t_rg32uint = OpVariable %_ptr_UniformConstant_36 UniformConstant
          %39 = OpTypeImage %int 1D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_39 = OpTypePointer UniformConstant %39
-%t_rg32sint_r = OpVariable %_ptr_UniformConstant_39 UniformConstant
+ %t_rg32sint = OpVariable %_ptr_UniformConstant_39 UniformConstant
          %42 = OpTypeImage %float 1D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_42 = OpTypePointer UniformConstant %42
-%t_rg32float_r = OpVariable %_ptr_UniformConstant_42 UniformConstant
+%t_rg32float = OpVariable %_ptr_UniformConstant_42 UniformConstant
          %45 = OpTypeImage %uint 1D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_45 = OpTypePointer UniformConstant %45
-%t_rgba32uint_r = OpVariable %_ptr_UniformConstant_45 UniformConstant
+%t_rgba32uint = OpVariable %_ptr_UniformConstant_45 UniformConstant
          %48 = OpTypeImage %int 1D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_48 = OpTypePointer UniformConstant %48
-%t_rgba32sint_r = OpVariable %_ptr_UniformConstant_48 UniformConstant
+%t_rgba32sint = OpVariable %_ptr_UniformConstant_48 UniformConstant
          %51 = OpTypeImage %float 1D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_51 = OpTypePointer UniformConstant %51
-%t_rgba32float_r = OpVariable %_ptr_UniformConstant_51 UniformConstant
-%_ptr_UniformConstant_3_0 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_w = OpVariable %_ptr_UniformConstant_3_0 UniformConstant
-%_ptr_UniformConstant_7_0 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_w = OpVariable %_ptr_UniformConstant_7_0 UniformConstant
-%_ptr_UniformConstant_10_0 = OpTypePointer UniformConstant %10
-%t_rgba8uint_w = OpVariable %_ptr_UniformConstant_10_0 UniformConstant
-%_ptr_UniformConstant_14_0 = OpTypePointer UniformConstant %14
-%t_rgba8sint_w = OpVariable %_ptr_UniformConstant_14_0 UniformConstant
-%_ptr_UniformConstant_18_0 = OpTypePointer UniformConstant %18
-%t_rgba16uint_w = OpVariable %_ptr_UniformConstant_18_0 UniformConstant
-%_ptr_UniformConstant_21_0 = OpTypePointer UniformConstant %21
-%t_rgba16sint_w = OpVariable %_ptr_UniformConstant_21_0 UniformConstant
-%_ptr_UniformConstant_24_0 = OpTypePointer UniformConstant %24
-%t_rgba16float_w = OpVariable %_ptr_UniformConstant_24_0 UniformConstant
-%_ptr_UniformConstant_27_0 = OpTypePointer UniformConstant %27
-%t_r32uint_w = OpVariable %_ptr_UniformConstant_27_0 UniformConstant
-%_ptr_UniformConstant_30_0 = OpTypePointer UniformConstant %30
-%t_r32sint_w = OpVariable %_ptr_UniformConstant_30_0 UniformConstant
-%_ptr_UniformConstant_33_0 = OpTypePointer UniformConstant %33
-%t_r32float_w = OpVariable %_ptr_UniformConstant_33_0 UniformConstant
-%_ptr_UniformConstant_36_0 = OpTypePointer UniformConstant %36
-%t_rg32uint_w = OpVariable %_ptr_UniformConstant_36_0 UniformConstant
-%_ptr_UniformConstant_39_0 = OpTypePointer UniformConstant %39
-%t_rg32sint_w = OpVariable %_ptr_UniformConstant_39_0 UniformConstant
-%_ptr_UniformConstant_42_0 = OpTypePointer UniformConstant %42
-%t_rg32float_w = OpVariable %_ptr_UniformConstant_42_0 UniformConstant
-%_ptr_UniformConstant_45_0 = OpTypePointer UniformConstant %45
-%t_rgba32uint_w = OpVariable %_ptr_UniformConstant_45_0 UniformConstant
-%_ptr_UniformConstant_48_0 = OpTypePointer UniformConstant %48
-%t_rgba32sint_w = OpVariable %_ptr_UniformConstant_48_0 UniformConstant
-%_ptr_UniformConstant_51_0 = OpTypePointer UniformConstant %51
-%t_rgba32float_w = OpVariable %_ptr_UniformConstant_51_0 UniformConstant
+%t_rgba32float = OpVariable %_ptr_UniformConstant_51 UniformConstant
        %void = OpTypeVoid
-         %84 = OpTypeFunction %void
-       %main = OpFunction %void None %84
-         %87 = OpLabel
+         %52 = OpTypeFunction %void
+       %main = OpFunction %void None %52
+         %55 = OpLabel
                OpReturn
                OpFunctionEnd
diff --git a/test/types/texture/storage/1d.wgsl.expected.wgsl b/test/types/texture/storage/1d.wgsl.expected.wgsl
index 284754f1eb..9b1f502e40 100644
--- a/test/types/texture/storage/1d.wgsl.expected.wgsl
+++ b/test/types/texture/storage/1d.wgsl.expected.wgsl
@@ -1,99 +1,51 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_1d<rgba8unorm, read>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_1d<rgba8unorm, write>;
 
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_1d<rgba8snorm, read>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_1d<rgba8snorm, write>;
 
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_1d<rgba8uint, read>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_1d<rgba8uint, write>;
 
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_1d<rgba8sint, read>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_1d<rgba8sint, write>;
 
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_1d<rgba16uint, read>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_1d<rgba16uint, write>;
 
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_1d<rgba16sint, read>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_1d<rgba16sint, write>;
 
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_1d<rgba16float, read>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_1d<rgba16float, write>;
 
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_1d<r32uint, read>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_1d<r32uint, write>;
 
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_1d<r32sint, read>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_1d<r32sint, write>;
 
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_1d<r32float, read>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_1d<r32float, write>;
 
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_1d<rg32uint, read>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_1d<rg32uint, write>;
 
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_1d<rg32sint, read>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_1d<rg32sint, write>;
 
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_1d<rg32float, read>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_1d<rg32float, write>;
 
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_1d<rgba32uint, read>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_1d<rgba32uint, write>;
 
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_1d<rgba32sint, read>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_1d<rgba32sint, write>;
 
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_1d<rgba32float, read>;
-
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_1d<rgba8unorm, write>;
-
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_1d<rgba8snorm, write>;
-
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_1d<rgba8uint, write>;
-
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_1d<rgba8sint, write>;
-
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_1d<rgba16uint, write>;
-
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_1d<rgba16sint, write>;
-
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_1d<rgba16float, write>;
-
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_1d<r32uint, write>;
-
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_1d<r32sint, write>;
-
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_1d<r32float, write>;
-
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_1d<rg32uint, write>;
-
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_1d<rg32sint, write>;
-
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_1d<rg32float, write>;
-
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_1d<rgba32uint, write>;
-
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_1d<rgba32sint, write>;
-
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_1d<rgba32float, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_1d<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/types/texture/storage/2d.wgsl b/test/types/texture/storage/2d.wgsl
index fab97c27c5..b84493d678 100644
--- a/test/types/texture/storage/2d.wgsl
+++ b/test/types/texture/storage/2d.wgsl
@@ -1,68 +1,36 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_2d<rgba8unorm, read>;
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_2d<rgba8snorm, read>;
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_2d<rgba8uint, read>;
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_2d<rgba8sint, read>;
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_2d<rgba16uint, read>;
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_2d<rgba16sint, read>;
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_2d<rgba16float, read>;
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_2d<r32uint, read>;
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_2d<r32sint, read>;
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_2d<r32float, read>;
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_2d<rg32uint, read>;
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_2d<rg32sint, read>;
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_2d<rg32float, read>;
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_2d<rgba32uint, read>;
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_2d<rgba32sint, read>;
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_2d<rgba32float, read>;
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_2d<rgba8unorm, write>;
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_2d<rgba8snorm, write>;
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_2d<rgba8uint, write>;
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_2d<rgba8sint, write>;
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_2d<rgba16uint, write>;
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_2d<rgba16sint, write>;
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_2d<rgba16float, write>;
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_2d<r32uint, write>;
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_2d<r32sint, write>;
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_2d<r32float, write>;
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_2d<rg32uint, write>;
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_2d<rg32sint, write>;
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_2d<rg32float, write>;
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_2d<rgba32uint, write>;
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_2d<rgba32sint, write>;
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_2d<rgba32float, write>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_2d<rgba8unorm, write>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_2d<rgba8snorm, write>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_2d<rgba8uint, write>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_2d<rgba8sint, write>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_2d<rgba16uint, write>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_2d<rgba16sint, write>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_2d<rgba16float, write>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_2d<r32uint, write>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_2d<r32sint, write>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_2d<r32float, write>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_2d<rg32uint, write>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_2d<rg32sint, write>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_2d<rg32float, write>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_2d<rgba32uint, write>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_2d<rgba32sint, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_2d<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/types/texture/storage/2d.wgsl.expected.hlsl b/test/types/texture/storage/2d.wgsl.expected.hlsl
index 9da236b28d..8e892b514b 100644
--- a/test/types/texture/storage/2d.wgsl.expected.hlsl
+++ b/test/types/texture/storage/2d.wgsl.expected.hlsl
@@ -1,69 +1,37 @@
-Texture2D<float4> t_rgba8unorm_r : register(t0, space0);
-Texture2D<float4> t_rgba8snorm_r : register(t1, space0);
-Texture2D<uint4> t_rgba8uint_r : register(t2, space0);
-Texture2D<int4> t_rgba8sint_r : register(t3, space0);
-Texture2D<uint4> t_rgba16uint_r : register(t4, space0);
-Texture2D<int4> t_rgba16sint_r : register(t5, space0);
-Texture2D<float4> t_rgba16float_r : register(t6, space0);
-Texture2D<uint4> t_r32uint_r : register(t7, space0);
-Texture2D<int4> t_r32sint_r : register(t8, space0);
-Texture2D<float4> t_r32float_r : register(t9, space0);
-Texture2D<uint4> t_rg32uint_r : register(t10, space0);
-Texture2D<int4> t_rg32sint_r : register(t11, space0);
-Texture2D<float4> t_rg32float_r : register(t12, space0);
-Texture2D<uint4> t_rgba32uint_r : register(t13, space0);
-Texture2D<int4> t_rgba32sint_r : register(t14, space0);
-Texture2D<float4> t_rgba32float_r : register(t15, space0);
-RWTexture2D<float4> t_rgba8unorm_w : register(u50, space0);
-RWTexture2D<float4> t_rgba8snorm_w : register(u51, space0);
-RWTexture2D<uint4> t_rgba8uint_w : register(u52, space0);
-RWTexture2D<int4> t_rgba8sint_w : register(u53, space0);
-RWTexture2D<uint4> t_rgba16uint_w : register(u54, space0);
-RWTexture2D<int4> t_rgba16sint_w : register(u55, space0);
-RWTexture2D<float4> t_rgba16float_w : register(u56, space0);
-RWTexture2D<uint4> t_r32uint_w : register(u57, space0);
-RWTexture2D<int4> t_r32sint_w : register(u58, space0);
-RWTexture2D<float4> t_r32float_w : register(u59, space0);
-RWTexture2D<uint4> t_rg32uint_w : register(u60, space0);
-RWTexture2D<int4> t_rg32sint_w : register(u61, space0);
-RWTexture2D<float4> t_rg32float_w : register(u62, space0);
-RWTexture2D<uint4> t_rgba32uint_w : register(u63, space0);
-RWTexture2D<int4> t_rgba32sint_w : register(u64, space0);
-RWTexture2D<float4> t_rgba32float_w : register(u65, space0);
+RWTexture2D<float4> t_rgba8unorm : register(u0, space0);
+RWTexture2D<float4> t_rgba8snorm : register(u1, space0);
+RWTexture2D<uint4> t_rgba8uint : register(u2, space0);
+RWTexture2D<int4> t_rgba8sint : register(u3, space0);
+RWTexture2D<uint4> t_rgba16uint : register(u4, space0);
+RWTexture2D<int4> t_rgba16sint : register(u5, space0);
+RWTexture2D<float4> t_rgba16float : register(u6, space0);
+RWTexture2D<uint4> t_r32uint : register(u7, space0);
+RWTexture2D<int4> t_r32sint : register(u8, space0);
+RWTexture2D<float4> t_r32float : register(u9, space0);
+RWTexture2D<uint4> t_rg32uint : register(u10, space0);
+RWTexture2D<int4> t_rg32sint : register(u11, space0);
+RWTexture2D<float4> t_rg32float : register(u12, space0);
+RWTexture2D<uint4> t_rgba32uint : register(u13, space0);
+RWTexture2D<int4> t_rgba32sint : register(u14, space0);
+RWTexture2D<float4> t_rgba32float : register(u15, space0);
 
 [numthreads(1, 1, 1)]
 void main() {
-  t_rgba8unorm_r;
-  t_rgba8snorm_r;
-  t_rgba8uint_r;
-  t_rgba8sint_r;
-  t_rgba16uint_r;
-  t_rgba16sint_r;
-  t_rgba16float_r;
-  t_r32uint_r;
-  t_r32sint_r;
-  t_r32float_r;
-  t_rg32uint_r;
-  t_rg32sint_r;
-  t_rg32float_r;
-  t_rgba32uint_r;
-  t_rgba32sint_r;
-  t_rgba32float_r;
-  t_rgba8unorm_w;
-  t_rgba8snorm_w;
-  t_rgba8uint_w;
-  t_rgba8sint_w;
-  t_rgba16uint_w;
-  t_rgba16sint_w;
-  t_rgba16float_w;
-  t_r32uint_w;
-  t_r32sint_w;
-  t_r32float_w;
-  t_rg32uint_w;
-  t_rg32sint_w;
-  t_rg32float_w;
-  t_rgba32uint_w;
-  t_rgba32sint_w;
-  t_rgba32float_w;
+  t_rgba8unorm;
+  t_rgba8snorm;
+  t_rgba8uint;
+  t_rgba8sint;
+  t_rgba16uint;
+  t_rgba16sint;
+  t_rgba16float;
+  t_r32uint;
+  t_r32sint;
+  t_r32float;
+  t_rg32uint;
+  t_rg32sint;
+  t_rg32float;
+  t_rgba32uint;
+  t_rgba32sint;
+  t_rgba32float;
   return;
 }
diff --git a/test/types/texture/storage/2d.wgsl.expected.msl b/test/types/texture/storage/2d.wgsl.expected.msl
index 7ee93d11be..c8041f36a4 100644
--- a/test/types/texture/storage/2d.wgsl.expected.msl
+++ b/test/types/texture/storage/2d.wgsl.expected.msl
@@ -1,7 +1,7 @@
 #include <metal_stdlib>
 
 using namespace metal;
-kernel void tint_symbol(texture2d<float, access::read> tint_symbol_1 [[texture(0)]], texture2d<float, access::read> tint_symbol_2 [[texture(1)]], texture2d<uint, access::read> tint_symbol_3 [[texture(2)]], texture2d<int, access::read> tint_symbol_4 [[texture(3)]], texture2d<uint, access::read> tint_symbol_5 [[texture(4)]], texture2d<int, access::read> tint_symbol_6 [[texture(5)]], texture2d<float, access::read> tint_symbol_7 [[texture(6)]], texture2d<uint, access::read> tint_symbol_8 [[texture(7)]], texture2d<int, access::read> tint_symbol_9 [[texture(8)]], texture2d<float, access::read> tint_symbol_10 [[texture(9)]], texture2d<uint, access::read> tint_symbol_11 [[texture(10)]], texture2d<int, access::read> tint_symbol_12 [[texture(11)]], texture2d<float, access::read> tint_symbol_13 [[texture(12)]], texture2d<uint, access::read> tint_symbol_14 [[texture(13)]], texture2d<int, access::read> tint_symbol_15 [[texture(14)]], texture2d<float, access::read> tint_symbol_16 [[texture(15)]], texture2d<float, access::write> tint_symbol_17 [[texture(16)]], texture2d<float, access::write> tint_symbol_18 [[texture(17)]], texture2d<uint, access::write> tint_symbol_19 [[texture(18)]], texture2d<int, access::write> tint_symbol_20 [[texture(19)]], texture2d<uint, access::write> tint_symbol_21 [[texture(20)]], texture2d<int, access::write> tint_symbol_22 [[texture(21)]], texture2d<float, access::write> tint_symbol_23 [[texture(22)]], texture2d<uint, access::write> tint_symbol_24 [[texture(23)]], texture2d<int, access::write> tint_symbol_25 [[texture(24)]], texture2d<float, access::write> tint_symbol_26 [[texture(25)]], texture2d<uint, access::write> tint_symbol_27 [[texture(26)]], texture2d<int, access::write> tint_symbol_28 [[texture(27)]], texture2d<float, access::write> tint_symbol_29 [[texture(28)]], texture2d<uint, access::write> tint_symbol_30 [[texture(29)]], texture2d<int, access::write> tint_symbol_31 [[texture(30)]], texture2d<float, access::write> tint_symbol_32 [[texture(31)]]) {
+kernel void tint_symbol(texture2d<float, access::write> tint_symbol_1 [[texture(0)]], texture2d<float, access::write> tint_symbol_2 [[texture(1)]], texture2d<uint, access::write> tint_symbol_3 [[texture(2)]], texture2d<int, access::write> tint_symbol_4 [[texture(3)]], texture2d<uint, access::write> tint_symbol_5 [[texture(4)]], texture2d<int, access::write> tint_symbol_6 [[texture(5)]], texture2d<float, access::write> tint_symbol_7 [[texture(6)]], texture2d<uint, access::write> tint_symbol_8 [[texture(7)]], texture2d<int, access::write> tint_symbol_9 [[texture(8)]], texture2d<float, access::write> tint_symbol_10 [[texture(9)]], texture2d<uint, access::write> tint_symbol_11 [[texture(10)]], texture2d<int, access::write> tint_symbol_12 [[texture(11)]], texture2d<float, access::write> tint_symbol_13 [[texture(12)]], texture2d<uint, access::write> tint_symbol_14 [[texture(13)]], texture2d<int, access::write> tint_symbol_15 [[texture(14)]], texture2d<float, access::write> tint_symbol_16 [[texture(15)]]) {
   (void) tint_symbol_1;
   (void) tint_symbol_2;
   (void) tint_symbol_3;
@@ -18,22 +18,6 @@ kernel void tint_symbol(texture2d<float, access::read> tint_symbol_1 [[texture(0
   (void) tint_symbol_14;
   (void) tint_symbol_15;
   (void) tint_symbol_16;
-  (void) tint_symbol_17;
-  (void) tint_symbol_18;
-  (void) tint_symbol_19;
-  (void) tint_symbol_20;
-  (void) tint_symbol_21;
-  (void) tint_symbol_22;
-  (void) tint_symbol_23;
-  (void) tint_symbol_24;
-  (void) tint_symbol_25;
-  (void) tint_symbol_26;
-  (void) tint_symbol_27;
-  (void) tint_symbol_28;
-  (void) tint_symbol_29;
-  (void) tint_symbol_30;
-  (void) tint_symbol_31;
-  (void) tint_symbol_32;
   return;
 }
 
diff --git a/test/types/texture/storage/2d.wgsl.expected.spvasm b/test/types/texture/storage/2d.wgsl.expected.spvasm
index 0a7060b9fb..db8de41ddd 100644
--- a/test/types/texture/storage/2d.wgsl.expected.spvasm
+++ b/test/types/texture/storage/2d.wgsl.expected.spvasm
@@ -1,228 +1,132 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 120
+; Bound: 72
 ; Schema: 0
                OpCapability Shader
                OpCapability StorageImageExtendedFormats
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %main "main"
                OpExecutionMode %main LocalSize 1 1 1
-               OpName %t_rgba8unorm_r "t_rgba8unorm_r"
-               OpName %t_rgba8snorm_r "t_rgba8snorm_r"
-               OpName %t_rgba8uint_r "t_rgba8uint_r"
-               OpName %t_rgba8sint_r "t_rgba8sint_r"
-               OpName %t_rgba16uint_r "t_rgba16uint_r"
-               OpName %t_rgba16sint_r "t_rgba16sint_r"
-               OpName %t_rgba16float_r "t_rgba16float_r"
-               OpName %t_r32uint_r "t_r32uint_r"
-               OpName %t_r32sint_r "t_r32sint_r"
-               OpName %t_r32float_r "t_r32float_r"
-               OpName %t_rg32uint_r "t_rg32uint_r"
-               OpName %t_rg32sint_r "t_rg32sint_r"
-               OpName %t_rg32float_r "t_rg32float_r"
-               OpName %t_rgba32uint_r "t_rgba32uint_r"
-               OpName %t_rgba32sint_r "t_rgba32sint_r"
-               OpName %t_rgba32float_r "t_rgba32float_r"
-               OpName %t_rgba8unorm_w "t_rgba8unorm_w"
-               OpName %t_rgba8snorm_w "t_rgba8snorm_w"
-               OpName %t_rgba8uint_w "t_rgba8uint_w"
-               OpName %t_rgba8sint_w "t_rgba8sint_w"
-               OpName %t_rgba16uint_w "t_rgba16uint_w"
-               OpName %t_rgba16sint_w "t_rgba16sint_w"
-               OpName %t_rgba16float_w "t_rgba16float_w"
-               OpName %t_r32uint_w "t_r32uint_w"
-               OpName %t_r32sint_w "t_r32sint_w"
-               OpName %t_r32float_w "t_r32float_w"
-               OpName %t_rg32uint_w "t_rg32uint_w"
-               OpName %t_rg32sint_w "t_rg32sint_w"
-               OpName %t_rg32float_w "t_rg32float_w"
-               OpName %t_rgba32uint_w "t_rgba32uint_w"
-               OpName %t_rgba32sint_w "t_rgba32sint_w"
-               OpName %t_rgba32float_w "t_rgba32float_w"
+               OpName %t_rgba8unorm "t_rgba8unorm"
+               OpName %t_rgba8snorm "t_rgba8snorm"
+               OpName %t_rgba8uint "t_rgba8uint"
+               OpName %t_rgba8sint "t_rgba8sint"
+               OpName %t_rgba16uint "t_rgba16uint"
+               OpName %t_rgba16sint "t_rgba16sint"
+               OpName %t_rgba16float "t_rgba16float"
+               OpName %t_r32uint "t_r32uint"
+               OpName %t_r32sint "t_r32sint"
+               OpName %t_r32float "t_r32float"
+               OpName %t_rg32uint "t_rg32uint"
+               OpName %t_rg32sint "t_rg32sint"
+               OpName %t_rg32float "t_rg32float"
+               OpName %t_rgba32uint "t_rgba32uint"
+               OpName %t_rgba32sint "t_rgba32sint"
+               OpName %t_rgba32float "t_rgba32float"
                OpName %main "main"
-               OpDecorate %t_rgba8unorm_r NonWritable
-               OpDecorate %t_rgba8unorm_r DescriptorSet 0
-               OpDecorate %t_rgba8unorm_r Binding 0
-               OpDecorate %t_rgba8snorm_r NonWritable
-               OpDecorate %t_rgba8snorm_r DescriptorSet 0
-               OpDecorate %t_rgba8snorm_r Binding 1
-               OpDecorate %t_rgba8uint_r NonWritable
-               OpDecorate %t_rgba8uint_r DescriptorSet 0
-               OpDecorate %t_rgba8uint_r Binding 2
-               OpDecorate %t_rgba8sint_r NonWritable
-               OpDecorate %t_rgba8sint_r DescriptorSet 0
-               OpDecorate %t_rgba8sint_r Binding 3
-               OpDecorate %t_rgba16uint_r NonWritable
-               OpDecorate %t_rgba16uint_r DescriptorSet 0
-               OpDecorate %t_rgba16uint_r Binding 4
-               OpDecorate %t_rgba16sint_r NonWritable
-               OpDecorate %t_rgba16sint_r DescriptorSet 0
-               OpDecorate %t_rgba16sint_r Binding 5
-               OpDecorate %t_rgba16float_r NonWritable
-               OpDecorate %t_rgba16float_r DescriptorSet 0
-               OpDecorate %t_rgba16float_r Binding 6
-               OpDecorate %t_r32uint_r NonWritable
-               OpDecorate %t_r32uint_r DescriptorSet 0
-               OpDecorate %t_r32uint_r Binding 7
-               OpDecorate %t_r32sint_r NonWritable
-               OpDecorate %t_r32sint_r DescriptorSet 0
-               OpDecorate %t_r32sint_r Binding 8
-               OpDecorate %t_r32float_r NonWritable
-               OpDecorate %t_r32float_r DescriptorSet 0
-               OpDecorate %t_r32float_r Binding 9
-               OpDecorate %t_rg32uint_r NonWritable
-               OpDecorate %t_rg32uint_r DescriptorSet 0
-               OpDecorate %t_rg32uint_r Binding 10
-               OpDecorate %t_rg32sint_r NonWritable
-               OpDecorate %t_rg32sint_r DescriptorSet 0
-               OpDecorate %t_rg32sint_r Binding 11
-               OpDecorate %t_rg32float_r NonWritable
-               OpDecorate %t_rg32float_r DescriptorSet 0
-               OpDecorate %t_rg32float_r Binding 12
-               OpDecorate %t_rgba32uint_r NonWritable
-               OpDecorate %t_rgba32uint_r DescriptorSet 0
-               OpDecorate %t_rgba32uint_r Binding 13
-               OpDecorate %t_rgba32sint_r NonWritable
-               OpDecorate %t_rgba32sint_r DescriptorSet 0
-               OpDecorate %t_rgba32sint_r Binding 14
-               OpDecorate %t_rgba32float_r NonWritable
-               OpDecorate %t_rgba32float_r DescriptorSet 0
-               OpDecorate %t_rgba32float_r Binding 15
-               OpDecorate %t_rgba8unorm_w NonReadable
-               OpDecorate %t_rgba8unorm_w DescriptorSet 0
-               OpDecorate %t_rgba8unorm_w Binding 50
-               OpDecorate %t_rgba8snorm_w NonReadable
-               OpDecorate %t_rgba8snorm_w DescriptorSet 0
-               OpDecorate %t_rgba8snorm_w Binding 51
-               OpDecorate %t_rgba8uint_w NonReadable
-               OpDecorate %t_rgba8uint_w DescriptorSet 0
-               OpDecorate %t_rgba8uint_w Binding 52
-               OpDecorate %t_rgba8sint_w NonReadable
-               OpDecorate %t_rgba8sint_w DescriptorSet 0
-               OpDecorate %t_rgba8sint_w Binding 53
-               OpDecorate %t_rgba16uint_w NonReadable
-               OpDecorate %t_rgba16uint_w DescriptorSet 0
-               OpDecorate %t_rgba16uint_w Binding 54
-               OpDecorate %t_rgba16sint_w NonReadable
-               OpDecorate %t_rgba16sint_w DescriptorSet 0
-               OpDecorate %t_rgba16sint_w Binding 55
-               OpDecorate %t_rgba16float_w NonReadable
-               OpDecorate %t_rgba16float_w DescriptorSet 0
-               OpDecorate %t_rgba16float_w Binding 56
-               OpDecorate %t_r32uint_w NonReadable
-               OpDecorate %t_r32uint_w DescriptorSet 0
-               OpDecorate %t_r32uint_w Binding 57
-               OpDecorate %t_r32sint_w NonReadable
-               OpDecorate %t_r32sint_w DescriptorSet 0
-               OpDecorate %t_r32sint_w Binding 58
-               OpDecorate %t_r32float_w NonReadable
-               OpDecorate %t_r32float_w DescriptorSet 0
-               OpDecorate %t_r32float_w Binding 59
-               OpDecorate %t_rg32uint_w NonReadable
-               OpDecorate %t_rg32uint_w DescriptorSet 0
-               OpDecorate %t_rg32uint_w Binding 60
-               OpDecorate %t_rg32sint_w NonReadable
-               OpDecorate %t_rg32sint_w DescriptorSet 0
-               OpDecorate %t_rg32sint_w Binding 61
-               OpDecorate %t_rg32float_w NonReadable
-               OpDecorate %t_rg32float_w DescriptorSet 0
-               OpDecorate %t_rg32float_w Binding 62
-               OpDecorate %t_rgba32uint_w NonReadable
-               OpDecorate %t_rgba32uint_w DescriptorSet 0
-               OpDecorate %t_rgba32uint_w Binding 63
-               OpDecorate %t_rgba32sint_w NonReadable
-               OpDecorate %t_rgba32sint_w DescriptorSet 0
-               OpDecorate %t_rgba32sint_w Binding 64
-               OpDecorate %t_rgba32float_w NonReadable
-               OpDecorate %t_rgba32float_w DescriptorSet 0
-               OpDecorate %t_rgba32float_w Binding 65
+               OpDecorate %t_rgba8unorm NonReadable
+               OpDecorate %t_rgba8unorm DescriptorSet 0
+               OpDecorate %t_rgba8unorm Binding 0
+               OpDecorate %t_rgba8snorm NonReadable
+               OpDecorate %t_rgba8snorm DescriptorSet 0
+               OpDecorate %t_rgba8snorm Binding 1
+               OpDecorate %t_rgba8uint NonReadable
+               OpDecorate %t_rgba8uint DescriptorSet 0
+               OpDecorate %t_rgba8uint Binding 2
+               OpDecorate %t_rgba8sint NonReadable
+               OpDecorate %t_rgba8sint DescriptorSet 0
+               OpDecorate %t_rgba8sint Binding 3
+               OpDecorate %t_rgba16uint NonReadable
+               OpDecorate %t_rgba16uint DescriptorSet 0
+               OpDecorate %t_rgba16uint Binding 4
+               OpDecorate %t_rgba16sint NonReadable
+               OpDecorate %t_rgba16sint DescriptorSet 0
+               OpDecorate %t_rgba16sint Binding 5
+               OpDecorate %t_rgba16float NonReadable
+               OpDecorate %t_rgba16float DescriptorSet 0
+               OpDecorate %t_rgba16float Binding 6
+               OpDecorate %t_r32uint NonReadable
+               OpDecorate %t_r32uint DescriptorSet 0
+               OpDecorate %t_r32uint Binding 7
+               OpDecorate %t_r32sint NonReadable
+               OpDecorate %t_r32sint DescriptorSet 0
+               OpDecorate %t_r32sint Binding 8
+               OpDecorate %t_r32float NonReadable
+               OpDecorate %t_r32float DescriptorSet 0
+               OpDecorate %t_r32float Binding 9
+               OpDecorate %t_rg32uint NonReadable
+               OpDecorate %t_rg32uint DescriptorSet 0
+               OpDecorate %t_rg32uint Binding 10
+               OpDecorate %t_rg32sint NonReadable
+               OpDecorate %t_rg32sint DescriptorSet 0
+               OpDecorate %t_rg32sint Binding 11
+               OpDecorate %t_rg32float NonReadable
+               OpDecorate %t_rg32float DescriptorSet 0
+               OpDecorate %t_rg32float Binding 12
+               OpDecorate %t_rgba32uint NonReadable
+               OpDecorate %t_rgba32uint DescriptorSet 0
+               OpDecorate %t_rgba32uint Binding 13
+               OpDecorate %t_rgba32sint NonReadable
+               OpDecorate %t_rgba32sint DescriptorSet 0
+               OpDecorate %t_rgba32sint Binding 14
+               OpDecorate %t_rgba32float NonReadable
+               OpDecorate %t_rgba32float DescriptorSet 0
+               OpDecorate %t_rgba32float Binding 15
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_r = OpVariable %_ptr_UniformConstant_3 UniformConstant
+%t_rgba8unorm = OpVariable %_ptr_UniformConstant_3 UniformConstant
           %7 = OpTypeImage %float 2D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_r = OpVariable %_ptr_UniformConstant_7 UniformConstant
+%t_rgba8snorm = OpVariable %_ptr_UniformConstant_7 UniformConstant
        %uint = OpTypeInt 32 0
          %10 = OpTypeImage %uint 2D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_10 = OpTypePointer UniformConstant %10
-%t_rgba8uint_r = OpVariable %_ptr_UniformConstant_10 UniformConstant
+%t_rgba8uint = OpVariable %_ptr_UniformConstant_10 UniformConstant
         %int = OpTypeInt 32 1
          %14 = OpTypeImage %int 2D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_14 = OpTypePointer UniformConstant %14
-%t_rgba8sint_r = OpVariable %_ptr_UniformConstant_14 UniformConstant
+%t_rgba8sint = OpVariable %_ptr_UniformConstant_14 UniformConstant
          %18 = OpTypeImage %uint 2D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_18 = OpTypePointer UniformConstant %18
-%t_rgba16uint_r = OpVariable %_ptr_UniformConstant_18 UniformConstant
+%t_rgba16uint = OpVariable %_ptr_UniformConstant_18 UniformConstant
          %21 = OpTypeImage %int 2D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_21 = OpTypePointer UniformConstant %21
-%t_rgba16sint_r = OpVariable %_ptr_UniformConstant_21 UniformConstant
+%t_rgba16sint = OpVariable %_ptr_UniformConstant_21 UniformConstant
          %24 = OpTypeImage %float 2D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_24 = OpTypePointer UniformConstant %24
-%t_rgba16float_r = OpVariable %_ptr_UniformConstant_24 UniformConstant
+%t_rgba16float = OpVariable %_ptr_UniformConstant_24 UniformConstant
          %27 = OpTypeImage %uint 2D 0 0 0 2 R32ui
 %_ptr_UniformConstant_27 = OpTypePointer UniformConstant %27
-%t_r32uint_r = OpVariable %_ptr_UniformConstant_27 UniformConstant
+  %t_r32uint = OpVariable %_ptr_UniformConstant_27 UniformConstant
          %30 = OpTypeImage %int 2D 0 0 0 2 R32i
 %_ptr_UniformConstant_30 = OpTypePointer UniformConstant %30
-%t_r32sint_r = OpVariable %_ptr_UniformConstant_30 UniformConstant
+  %t_r32sint = OpVariable %_ptr_UniformConstant_30 UniformConstant
          %33 = OpTypeImage %float 2D 0 0 0 2 R32f
 %_ptr_UniformConstant_33 = OpTypePointer UniformConstant %33
-%t_r32float_r = OpVariable %_ptr_UniformConstant_33 UniformConstant
+ %t_r32float = OpVariable %_ptr_UniformConstant_33 UniformConstant
          %36 = OpTypeImage %uint 2D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_36 = OpTypePointer UniformConstant %36
-%t_rg32uint_r = OpVariable %_ptr_UniformConstant_36 UniformConstant
+ %t_rg32uint = OpVariable %_ptr_UniformConstant_36 UniformConstant
          %39 = OpTypeImage %int 2D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_39 = OpTypePointer UniformConstant %39
-%t_rg32sint_r = OpVariable %_ptr_UniformConstant_39 UniformConstant
+ %t_rg32sint = OpVariable %_ptr_UniformConstant_39 UniformConstant
          %42 = OpTypeImage %float 2D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_42 = OpTypePointer UniformConstant %42
-%t_rg32float_r = OpVariable %_ptr_UniformConstant_42 UniformConstant
+%t_rg32float = OpVariable %_ptr_UniformConstant_42 UniformConstant
          %45 = OpTypeImage %uint 2D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_45 = OpTypePointer UniformConstant %45
-%t_rgba32uint_r = OpVariable %_ptr_UniformConstant_45 UniformConstant
+%t_rgba32uint = OpVariable %_ptr_UniformConstant_45 UniformConstant
          %48 = OpTypeImage %int 2D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_48 = OpTypePointer UniformConstant %48
-%t_rgba32sint_r = OpVariable %_ptr_UniformConstant_48 UniformConstant
+%t_rgba32sint = OpVariable %_ptr_UniformConstant_48 UniformConstant
          %51 = OpTypeImage %float 2D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_51 = OpTypePointer UniformConstant %51
-%t_rgba32float_r = OpVariable %_ptr_UniformConstant_51 UniformConstant
-%_ptr_UniformConstant_3_0 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_w = OpVariable %_ptr_UniformConstant_3_0 UniformConstant
-%_ptr_UniformConstant_7_0 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_w = OpVariable %_ptr_UniformConstant_7_0 UniformConstant
-%_ptr_UniformConstant_10_0 = OpTypePointer UniformConstant %10
-%t_rgba8uint_w = OpVariable %_ptr_UniformConstant_10_0 UniformConstant
-%_ptr_UniformConstant_14_0 = OpTypePointer UniformConstant %14
-%t_rgba8sint_w = OpVariable %_ptr_UniformConstant_14_0 UniformConstant
-%_ptr_UniformConstant_18_0 = OpTypePointer UniformConstant %18
-%t_rgba16uint_w = OpVariable %_ptr_UniformConstant_18_0 UniformConstant
-%_ptr_UniformConstant_21_0 = OpTypePointer UniformConstant %21
-%t_rgba16sint_w = OpVariable %_ptr_UniformConstant_21_0 UniformConstant
-%_ptr_UniformConstant_24_0 = OpTypePointer UniformConstant %24
-%t_rgba16float_w = OpVariable %_ptr_UniformConstant_24_0 UniformConstant
-%_ptr_UniformConstant_27_0 = OpTypePointer UniformConstant %27
-%t_r32uint_w = OpVariable %_ptr_UniformConstant_27_0 UniformConstant
-%_ptr_UniformConstant_30_0 = OpTypePointer UniformConstant %30
-%t_r32sint_w = OpVariable %_ptr_UniformConstant_30_0 UniformConstant
-%_ptr_UniformConstant_33_0 = OpTypePointer UniformConstant %33
-%t_r32float_w = OpVariable %_ptr_UniformConstant_33_0 UniformConstant
-%_ptr_UniformConstant_36_0 = OpTypePointer UniformConstant %36
-%t_rg32uint_w = OpVariable %_ptr_UniformConstant_36_0 UniformConstant
-%_ptr_UniformConstant_39_0 = OpTypePointer UniformConstant %39
-%t_rg32sint_w = OpVariable %_ptr_UniformConstant_39_0 UniformConstant
-%_ptr_UniformConstant_42_0 = OpTypePointer UniformConstant %42
-%t_rg32float_w = OpVariable %_ptr_UniformConstant_42_0 UniformConstant
-%_ptr_UniformConstant_45_0 = OpTypePointer UniformConstant %45
-%t_rgba32uint_w = OpVariable %_ptr_UniformConstant_45_0 UniformConstant
-%_ptr_UniformConstant_48_0 = OpTypePointer UniformConstant %48
-%t_rgba32sint_w = OpVariable %_ptr_UniformConstant_48_0 UniformConstant
-%_ptr_UniformConstant_51_0 = OpTypePointer UniformConstant %51
-%t_rgba32float_w = OpVariable %_ptr_UniformConstant_51_0 UniformConstant
+%t_rgba32float = OpVariable %_ptr_UniformConstant_51 UniformConstant
        %void = OpTypeVoid
-         %84 = OpTypeFunction %void
-       %main = OpFunction %void None %84
-         %87 = OpLabel
+         %52 = OpTypeFunction %void
+       %main = OpFunction %void None %52
+         %55 = OpLabel
                OpReturn
                OpFunctionEnd
diff --git a/test/types/texture/storage/2d.wgsl.expected.wgsl b/test/types/texture/storage/2d.wgsl.expected.wgsl
index 572ed32c0a..eb2a58f324 100644
--- a/test/types/texture/storage/2d.wgsl.expected.wgsl
+++ b/test/types/texture/storage/2d.wgsl.expected.wgsl
@@ -1,99 +1,51 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_2d<rgba8unorm, read>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_2d<rgba8unorm, write>;
 
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_2d<rgba8snorm, read>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_2d<rgba8snorm, write>;
 
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_2d<rgba8uint, read>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_2d<rgba8uint, write>;
 
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_2d<rgba8sint, read>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_2d<rgba8sint, write>;
 
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_2d<rgba16uint, read>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_2d<rgba16uint, write>;
 
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_2d<rgba16sint, read>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_2d<rgba16sint, write>;
 
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_2d<rgba16float, read>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_2d<rgba16float, write>;
 
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_2d<r32uint, read>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_2d<r32uint, write>;
 
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_2d<r32sint, read>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_2d<r32sint, write>;
 
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_2d<r32float, read>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_2d<r32float, write>;
 
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_2d<rg32uint, read>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_2d<rg32uint, write>;
 
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_2d<rg32sint, read>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_2d<rg32sint, write>;
 
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_2d<rg32float, read>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_2d<rg32float, write>;
 
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_2d<rgba32uint, read>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_2d<rgba32uint, write>;
 
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_2d<rgba32sint, read>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_2d<rgba32sint, write>;
 
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_2d<rgba32float, read>;
-
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_2d<rgba8unorm, write>;
-
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_2d<rgba8snorm, write>;
-
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_2d<rgba8uint, write>;
-
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_2d<rgba8sint, write>;
-
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_2d<rgba16uint, write>;
-
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_2d<rgba16sint, write>;
-
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_2d<rgba16float, write>;
-
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_2d<r32uint, write>;
-
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_2d<r32sint, write>;
-
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_2d<r32float, write>;
-
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_2d<rg32uint, write>;
-
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_2d<rg32sint, write>;
-
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_2d<rg32float, write>;
-
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_2d<rgba32uint, write>;
-
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_2d<rgba32sint, write>;
-
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_2d<rgba32float, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_2d<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/types/texture/storage/2d_array.wgsl b/test/types/texture/storage/2d_array.wgsl
index 6e8ac917a3..798b9614d3 100644
--- a/test/types/texture/storage/2d_array.wgsl
+++ b/test/types/texture/storage/2d_array.wgsl
@@ -1,68 +1,36 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_2d_array<rgba8unorm, read>;
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_2d_array<rgba8snorm, read>;
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_2d_array<rgba8uint, read>;
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_2d_array<rgba8sint, read>;
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_2d_array<rgba16uint, read>;
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_2d_array<rgba16sint, read>;
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_2d_array<rgba16float, read>;
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_2d_array<r32uint, read>;
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_2d_array<r32sint, read>;
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_2d_array<r32float, read>;
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_2d_array<rg32uint, read>;
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_2d_array<rg32sint, read>;
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_2d_array<rg32float, read>;
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_2d_array<rgba32uint, read>;
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_2d_array<rgba32sint, read>;
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_2d_array<rgba32float, read>;
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_2d_array<rgba8unorm, write>;
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_2d_array<rgba8snorm, write>;
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_2d_array<rgba8uint, write>;
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_2d_array<rgba8sint, write>;
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_2d_array<rgba16uint, write>;
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_2d_array<rgba16sint, write>;
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_2d_array<rgba16float, write>;
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_2d_array<r32uint, write>;
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_2d_array<r32sint, write>;
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_2d_array<r32float, write>;
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_2d_array<rg32uint, write>;
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_2d_array<rg32sint, write>;
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_2d_array<rg32float, write>;
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_2d_array<rgba32uint, write>;
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_2d_array<rgba32sint, write>;
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_2d_array<rgba32float, write>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_2d_array<rgba8unorm, write>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_2d_array<rgba8snorm, write>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_2d_array<rgba8uint, write>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_2d_array<rgba8sint, write>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_2d_array<rgba16uint, write>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_2d_array<rgba16sint, write>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_2d_array<rgba16float, write>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_2d_array<r32uint, write>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_2d_array<r32sint, write>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_2d_array<r32float, write>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_2d_array<rg32uint, write>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_2d_array<rg32sint, write>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_2d_array<rg32float, write>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_2d_array<rgba32uint, write>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_2d_array<rgba32sint, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_2d_array<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/types/texture/storage/2d_array.wgsl.expected.hlsl b/test/types/texture/storage/2d_array.wgsl.expected.hlsl
index 923bf4815e..8d3bd0eced 100644
--- a/test/types/texture/storage/2d_array.wgsl.expected.hlsl
+++ b/test/types/texture/storage/2d_array.wgsl.expected.hlsl
@@ -1,69 +1,37 @@
-Texture2DArray<float4> t_rgba8unorm_r : register(t0, space0);
-Texture2DArray<float4> t_rgba8snorm_r : register(t1, space0);
-Texture2DArray<uint4> t_rgba8uint_r : register(t2, space0);
-Texture2DArray<int4> t_rgba8sint_r : register(t3, space0);
-Texture2DArray<uint4> t_rgba16uint_r : register(t4, space0);
-Texture2DArray<int4> t_rgba16sint_r : register(t5, space0);
-Texture2DArray<float4> t_rgba16float_r : register(t6, space0);
-Texture2DArray<uint4> t_r32uint_r : register(t7, space0);
-Texture2DArray<int4> t_r32sint_r : register(t8, space0);
-Texture2DArray<float4> t_r32float_r : register(t9, space0);
-Texture2DArray<uint4> t_rg32uint_r : register(t10, space0);
-Texture2DArray<int4> t_rg32sint_r : register(t11, space0);
-Texture2DArray<float4> t_rg32float_r : register(t12, space0);
-Texture2DArray<uint4> t_rgba32uint_r : register(t13, space0);
-Texture2DArray<int4> t_rgba32sint_r : register(t14, space0);
-Texture2DArray<float4> t_rgba32float_r : register(t15, space0);
-RWTexture2DArray<float4> t_rgba8unorm_w : register(u50, space0);
-RWTexture2DArray<float4> t_rgba8snorm_w : register(u51, space0);
-RWTexture2DArray<uint4> t_rgba8uint_w : register(u52, space0);
-RWTexture2DArray<int4> t_rgba8sint_w : register(u53, space0);
-RWTexture2DArray<uint4> t_rgba16uint_w : register(u54, space0);
-RWTexture2DArray<int4> t_rgba16sint_w : register(u55, space0);
-RWTexture2DArray<float4> t_rgba16float_w : register(u56, space0);
-RWTexture2DArray<uint4> t_r32uint_w : register(u57, space0);
-RWTexture2DArray<int4> t_r32sint_w : register(u58, space0);
-RWTexture2DArray<float4> t_r32float_w : register(u59, space0);
-RWTexture2DArray<uint4> t_rg32uint_w : register(u60, space0);
-RWTexture2DArray<int4> t_rg32sint_w : register(u61, space0);
-RWTexture2DArray<float4> t_rg32float_w : register(u62, space0);
-RWTexture2DArray<uint4> t_rgba32uint_w : register(u63, space0);
-RWTexture2DArray<int4> t_rgba32sint_w : register(u64, space0);
-RWTexture2DArray<float4> t_rgba32float_w : register(u65, space0);
+RWTexture2DArray<float4> t_rgba8unorm : register(u0, space0);
+RWTexture2DArray<float4> t_rgba8snorm : register(u1, space0);
+RWTexture2DArray<uint4> t_rgba8uint : register(u2, space0);
+RWTexture2DArray<int4> t_rgba8sint : register(u3, space0);
+RWTexture2DArray<uint4> t_rgba16uint : register(u4, space0);
+RWTexture2DArray<int4> t_rgba16sint : register(u5, space0);
+RWTexture2DArray<float4> t_rgba16float : register(u6, space0);
+RWTexture2DArray<uint4> t_r32uint : register(u7, space0);
+RWTexture2DArray<int4> t_r32sint : register(u8, space0);
+RWTexture2DArray<float4> t_r32float : register(u9, space0);
+RWTexture2DArray<uint4> t_rg32uint : register(u10, space0);
+RWTexture2DArray<int4> t_rg32sint : register(u11, space0);
+RWTexture2DArray<float4> t_rg32float : register(u12, space0);
+RWTexture2DArray<uint4> t_rgba32uint : register(u13, space0);
+RWTexture2DArray<int4> t_rgba32sint : register(u14, space0);
+RWTexture2DArray<float4> t_rgba32float : register(u15, space0);
 
 [numthreads(1, 1, 1)]
 void main() {
-  t_rgba8unorm_r;
-  t_rgba8snorm_r;
-  t_rgba8uint_r;
-  t_rgba8sint_r;
-  t_rgba16uint_r;
-  t_rgba16sint_r;
-  t_rgba16float_r;
-  t_r32uint_r;
-  t_r32sint_r;
-  t_r32float_r;
-  t_rg32uint_r;
-  t_rg32sint_r;
-  t_rg32float_r;
-  t_rgba32uint_r;
-  t_rgba32sint_r;
-  t_rgba32float_r;
-  t_rgba8unorm_w;
-  t_rgba8snorm_w;
-  t_rgba8uint_w;
-  t_rgba8sint_w;
-  t_rgba16uint_w;
-  t_rgba16sint_w;
-  t_rgba16float_w;
-  t_r32uint_w;
-  t_r32sint_w;
-  t_r32float_w;
-  t_rg32uint_w;
-  t_rg32sint_w;
-  t_rg32float_w;
-  t_rgba32uint_w;
-  t_rgba32sint_w;
-  t_rgba32float_w;
+  t_rgba8unorm;
+  t_rgba8snorm;
+  t_rgba8uint;
+  t_rgba8sint;
+  t_rgba16uint;
+  t_rgba16sint;
+  t_rgba16float;
+  t_r32uint;
+  t_r32sint;
+  t_r32float;
+  t_rg32uint;
+  t_rg32sint;
+  t_rg32float;
+  t_rgba32uint;
+  t_rgba32sint;
+  t_rgba32float;
   return;
 }
diff --git a/test/types/texture/storage/2d_array.wgsl.expected.msl b/test/types/texture/storage/2d_array.wgsl.expected.msl
index 32af7492fc..a3029caa39 100644
--- a/test/types/texture/storage/2d_array.wgsl.expected.msl
+++ b/test/types/texture/storage/2d_array.wgsl.expected.msl
@@ -1,7 +1,7 @@
 #include <metal_stdlib>
 
 using namespace metal;
-kernel void tint_symbol(texture2d_array<float, access::read> tint_symbol_1 [[texture(0)]], texture2d_array<float, access::read> tint_symbol_2 [[texture(1)]], texture2d_array<uint, access::read> tint_symbol_3 [[texture(2)]], texture2d_array<int, access::read> tint_symbol_4 [[texture(3)]], texture2d_array<uint, access::read> tint_symbol_5 [[texture(4)]], texture2d_array<int, access::read> tint_symbol_6 [[texture(5)]], texture2d_array<float, access::read> tint_symbol_7 [[texture(6)]], texture2d_array<uint, access::read> tint_symbol_8 [[texture(7)]], texture2d_array<int, access::read> tint_symbol_9 [[texture(8)]], texture2d_array<float, access::read> tint_symbol_10 [[texture(9)]], texture2d_array<uint, access::read> tint_symbol_11 [[texture(10)]], texture2d_array<int, access::read> tint_symbol_12 [[texture(11)]], texture2d_array<float, access::read> tint_symbol_13 [[texture(12)]], texture2d_array<uint, access::read> tint_symbol_14 [[texture(13)]], texture2d_array<int, access::read> tint_symbol_15 [[texture(14)]], texture2d_array<float, access::read> tint_symbol_16 [[texture(15)]], texture2d_array<float, access::write> tint_symbol_17 [[texture(16)]], texture2d_array<float, access::write> tint_symbol_18 [[texture(17)]], texture2d_array<uint, access::write> tint_symbol_19 [[texture(18)]], texture2d_array<int, access::write> tint_symbol_20 [[texture(19)]], texture2d_array<uint, access::write> tint_symbol_21 [[texture(20)]], texture2d_array<int, access::write> tint_symbol_22 [[texture(21)]], texture2d_array<float, access::write> tint_symbol_23 [[texture(22)]], texture2d_array<uint, access::write> tint_symbol_24 [[texture(23)]], texture2d_array<int, access::write> tint_symbol_25 [[texture(24)]], texture2d_array<float, access::write> tint_symbol_26 [[texture(25)]], texture2d_array<uint, access::write> tint_symbol_27 [[texture(26)]], texture2d_array<int, access::write> tint_symbol_28 [[texture(27)]], texture2d_array<float, access::write> tint_symbol_29 [[texture(28)]], texture2d_array<uint, access::write> tint_symbol_30 [[texture(29)]], texture2d_array<int, access::write> tint_symbol_31 [[texture(30)]], texture2d_array<float, access::write> tint_symbol_32 [[texture(31)]]) {
+kernel void tint_symbol(texture2d_array<float, access::write> tint_symbol_1 [[texture(0)]], texture2d_array<float, access::write> tint_symbol_2 [[texture(1)]], texture2d_array<uint, access::write> tint_symbol_3 [[texture(2)]], texture2d_array<int, access::write> tint_symbol_4 [[texture(3)]], texture2d_array<uint, access::write> tint_symbol_5 [[texture(4)]], texture2d_array<int, access::write> tint_symbol_6 [[texture(5)]], texture2d_array<float, access::write> tint_symbol_7 [[texture(6)]], texture2d_array<uint, access::write> tint_symbol_8 [[texture(7)]], texture2d_array<int, access::write> tint_symbol_9 [[texture(8)]], texture2d_array<float, access::write> tint_symbol_10 [[texture(9)]], texture2d_array<uint, access::write> tint_symbol_11 [[texture(10)]], texture2d_array<int, access::write> tint_symbol_12 [[texture(11)]], texture2d_array<float, access::write> tint_symbol_13 [[texture(12)]], texture2d_array<uint, access::write> tint_symbol_14 [[texture(13)]], texture2d_array<int, access::write> tint_symbol_15 [[texture(14)]], texture2d_array<float, access::write> tint_symbol_16 [[texture(15)]]) {
   (void) tint_symbol_1;
   (void) tint_symbol_2;
   (void) tint_symbol_3;
@@ -18,22 +18,6 @@ kernel void tint_symbol(texture2d_array<float, access::read> tint_symbol_1 [[tex
   (void) tint_symbol_14;
   (void) tint_symbol_15;
   (void) tint_symbol_16;
-  (void) tint_symbol_17;
-  (void) tint_symbol_18;
-  (void) tint_symbol_19;
-  (void) tint_symbol_20;
-  (void) tint_symbol_21;
-  (void) tint_symbol_22;
-  (void) tint_symbol_23;
-  (void) tint_symbol_24;
-  (void) tint_symbol_25;
-  (void) tint_symbol_26;
-  (void) tint_symbol_27;
-  (void) tint_symbol_28;
-  (void) tint_symbol_29;
-  (void) tint_symbol_30;
-  (void) tint_symbol_31;
-  (void) tint_symbol_32;
   return;
 }
 
diff --git a/test/types/texture/storage/2d_array.wgsl.expected.spvasm b/test/types/texture/storage/2d_array.wgsl.expected.spvasm
index bc8c3fe774..a9c7167ebd 100644
--- a/test/types/texture/storage/2d_array.wgsl.expected.spvasm
+++ b/test/types/texture/storage/2d_array.wgsl.expected.spvasm
@@ -1,228 +1,132 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 120
+; Bound: 72
 ; Schema: 0
                OpCapability Shader
                OpCapability StorageImageExtendedFormats
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %main "main"
                OpExecutionMode %main LocalSize 1 1 1
-               OpName %t_rgba8unorm_r "t_rgba8unorm_r"
-               OpName %t_rgba8snorm_r "t_rgba8snorm_r"
-               OpName %t_rgba8uint_r "t_rgba8uint_r"
-               OpName %t_rgba8sint_r "t_rgba8sint_r"
-               OpName %t_rgba16uint_r "t_rgba16uint_r"
-               OpName %t_rgba16sint_r "t_rgba16sint_r"
-               OpName %t_rgba16float_r "t_rgba16float_r"
-               OpName %t_r32uint_r "t_r32uint_r"
-               OpName %t_r32sint_r "t_r32sint_r"
-               OpName %t_r32float_r "t_r32float_r"
-               OpName %t_rg32uint_r "t_rg32uint_r"
-               OpName %t_rg32sint_r "t_rg32sint_r"
-               OpName %t_rg32float_r "t_rg32float_r"
-               OpName %t_rgba32uint_r "t_rgba32uint_r"
-               OpName %t_rgba32sint_r "t_rgba32sint_r"
-               OpName %t_rgba32float_r "t_rgba32float_r"
-               OpName %t_rgba8unorm_w "t_rgba8unorm_w"
-               OpName %t_rgba8snorm_w "t_rgba8snorm_w"
-               OpName %t_rgba8uint_w "t_rgba8uint_w"
-               OpName %t_rgba8sint_w "t_rgba8sint_w"
-               OpName %t_rgba16uint_w "t_rgba16uint_w"
-               OpName %t_rgba16sint_w "t_rgba16sint_w"
-               OpName %t_rgba16float_w "t_rgba16float_w"
-               OpName %t_r32uint_w "t_r32uint_w"
-               OpName %t_r32sint_w "t_r32sint_w"
-               OpName %t_r32float_w "t_r32float_w"
-               OpName %t_rg32uint_w "t_rg32uint_w"
-               OpName %t_rg32sint_w "t_rg32sint_w"
-               OpName %t_rg32float_w "t_rg32float_w"
-               OpName %t_rgba32uint_w "t_rgba32uint_w"
-               OpName %t_rgba32sint_w "t_rgba32sint_w"
-               OpName %t_rgba32float_w "t_rgba32float_w"
+               OpName %t_rgba8unorm "t_rgba8unorm"
+               OpName %t_rgba8snorm "t_rgba8snorm"
+               OpName %t_rgba8uint "t_rgba8uint"
+               OpName %t_rgba8sint "t_rgba8sint"
+               OpName %t_rgba16uint "t_rgba16uint"
+               OpName %t_rgba16sint "t_rgba16sint"
+               OpName %t_rgba16float "t_rgba16float"
+               OpName %t_r32uint "t_r32uint"
+               OpName %t_r32sint "t_r32sint"
+               OpName %t_r32float "t_r32float"
+               OpName %t_rg32uint "t_rg32uint"
+               OpName %t_rg32sint "t_rg32sint"
+               OpName %t_rg32float "t_rg32float"
+               OpName %t_rgba32uint "t_rgba32uint"
+               OpName %t_rgba32sint "t_rgba32sint"
+               OpName %t_rgba32float "t_rgba32float"
                OpName %main "main"
-               OpDecorate %t_rgba8unorm_r NonWritable
-               OpDecorate %t_rgba8unorm_r DescriptorSet 0
-               OpDecorate %t_rgba8unorm_r Binding 0
-               OpDecorate %t_rgba8snorm_r NonWritable
-               OpDecorate %t_rgba8snorm_r DescriptorSet 0
-               OpDecorate %t_rgba8snorm_r Binding 1
-               OpDecorate %t_rgba8uint_r NonWritable
-               OpDecorate %t_rgba8uint_r DescriptorSet 0
-               OpDecorate %t_rgba8uint_r Binding 2
-               OpDecorate %t_rgba8sint_r NonWritable
-               OpDecorate %t_rgba8sint_r DescriptorSet 0
-               OpDecorate %t_rgba8sint_r Binding 3
-               OpDecorate %t_rgba16uint_r NonWritable
-               OpDecorate %t_rgba16uint_r DescriptorSet 0
-               OpDecorate %t_rgba16uint_r Binding 4
-               OpDecorate %t_rgba16sint_r NonWritable
-               OpDecorate %t_rgba16sint_r DescriptorSet 0
-               OpDecorate %t_rgba16sint_r Binding 5
-               OpDecorate %t_rgba16float_r NonWritable
-               OpDecorate %t_rgba16float_r DescriptorSet 0
-               OpDecorate %t_rgba16float_r Binding 6
-               OpDecorate %t_r32uint_r NonWritable
-               OpDecorate %t_r32uint_r DescriptorSet 0
-               OpDecorate %t_r32uint_r Binding 7
-               OpDecorate %t_r32sint_r NonWritable
-               OpDecorate %t_r32sint_r DescriptorSet 0
-               OpDecorate %t_r32sint_r Binding 8
-               OpDecorate %t_r32float_r NonWritable
-               OpDecorate %t_r32float_r DescriptorSet 0
-               OpDecorate %t_r32float_r Binding 9
-               OpDecorate %t_rg32uint_r NonWritable
-               OpDecorate %t_rg32uint_r DescriptorSet 0
-               OpDecorate %t_rg32uint_r Binding 10
-               OpDecorate %t_rg32sint_r NonWritable
-               OpDecorate %t_rg32sint_r DescriptorSet 0
-               OpDecorate %t_rg32sint_r Binding 11
-               OpDecorate %t_rg32float_r NonWritable
-               OpDecorate %t_rg32float_r DescriptorSet 0
-               OpDecorate %t_rg32float_r Binding 12
-               OpDecorate %t_rgba32uint_r NonWritable
-               OpDecorate %t_rgba32uint_r DescriptorSet 0
-               OpDecorate %t_rgba32uint_r Binding 13
-               OpDecorate %t_rgba32sint_r NonWritable
-               OpDecorate %t_rgba32sint_r DescriptorSet 0
-               OpDecorate %t_rgba32sint_r Binding 14
-               OpDecorate %t_rgba32float_r NonWritable
-               OpDecorate %t_rgba32float_r DescriptorSet 0
-               OpDecorate %t_rgba32float_r Binding 15
-               OpDecorate %t_rgba8unorm_w NonReadable
-               OpDecorate %t_rgba8unorm_w DescriptorSet 0
-               OpDecorate %t_rgba8unorm_w Binding 50
-               OpDecorate %t_rgba8snorm_w NonReadable
-               OpDecorate %t_rgba8snorm_w DescriptorSet 0
-               OpDecorate %t_rgba8snorm_w Binding 51
-               OpDecorate %t_rgba8uint_w NonReadable
-               OpDecorate %t_rgba8uint_w DescriptorSet 0
-               OpDecorate %t_rgba8uint_w Binding 52
-               OpDecorate %t_rgba8sint_w NonReadable
-               OpDecorate %t_rgba8sint_w DescriptorSet 0
-               OpDecorate %t_rgba8sint_w Binding 53
-               OpDecorate %t_rgba16uint_w NonReadable
-               OpDecorate %t_rgba16uint_w DescriptorSet 0
-               OpDecorate %t_rgba16uint_w Binding 54
-               OpDecorate %t_rgba16sint_w NonReadable
-               OpDecorate %t_rgba16sint_w DescriptorSet 0
-               OpDecorate %t_rgba16sint_w Binding 55
-               OpDecorate %t_rgba16float_w NonReadable
-               OpDecorate %t_rgba16float_w DescriptorSet 0
-               OpDecorate %t_rgba16float_w Binding 56
-               OpDecorate %t_r32uint_w NonReadable
-               OpDecorate %t_r32uint_w DescriptorSet 0
-               OpDecorate %t_r32uint_w Binding 57
-               OpDecorate %t_r32sint_w NonReadable
-               OpDecorate %t_r32sint_w DescriptorSet 0
-               OpDecorate %t_r32sint_w Binding 58
-               OpDecorate %t_r32float_w NonReadable
-               OpDecorate %t_r32float_w DescriptorSet 0
-               OpDecorate %t_r32float_w Binding 59
-               OpDecorate %t_rg32uint_w NonReadable
-               OpDecorate %t_rg32uint_w DescriptorSet 0
-               OpDecorate %t_rg32uint_w Binding 60
-               OpDecorate %t_rg32sint_w NonReadable
-               OpDecorate %t_rg32sint_w DescriptorSet 0
-               OpDecorate %t_rg32sint_w Binding 61
-               OpDecorate %t_rg32float_w NonReadable
-               OpDecorate %t_rg32float_w DescriptorSet 0
-               OpDecorate %t_rg32float_w Binding 62
-               OpDecorate %t_rgba32uint_w NonReadable
-               OpDecorate %t_rgba32uint_w DescriptorSet 0
-               OpDecorate %t_rgba32uint_w Binding 63
-               OpDecorate %t_rgba32sint_w NonReadable
-               OpDecorate %t_rgba32sint_w DescriptorSet 0
-               OpDecorate %t_rgba32sint_w Binding 64
-               OpDecorate %t_rgba32float_w NonReadable
-               OpDecorate %t_rgba32float_w DescriptorSet 0
-               OpDecorate %t_rgba32float_w Binding 65
+               OpDecorate %t_rgba8unorm NonReadable
+               OpDecorate %t_rgba8unorm DescriptorSet 0
+               OpDecorate %t_rgba8unorm Binding 0
+               OpDecorate %t_rgba8snorm NonReadable
+               OpDecorate %t_rgba8snorm DescriptorSet 0
+               OpDecorate %t_rgba8snorm Binding 1
+               OpDecorate %t_rgba8uint NonReadable
+               OpDecorate %t_rgba8uint DescriptorSet 0
+               OpDecorate %t_rgba8uint Binding 2
+               OpDecorate %t_rgba8sint NonReadable
+               OpDecorate %t_rgba8sint DescriptorSet 0
+               OpDecorate %t_rgba8sint Binding 3
+               OpDecorate %t_rgba16uint NonReadable
+               OpDecorate %t_rgba16uint DescriptorSet 0
+               OpDecorate %t_rgba16uint Binding 4
+               OpDecorate %t_rgba16sint NonReadable
+               OpDecorate %t_rgba16sint DescriptorSet 0
+               OpDecorate %t_rgba16sint Binding 5
+               OpDecorate %t_rgba16float NonReadable
+               OpDecorate %t_rgba16float DescriptorSet 0
+               OpDecorate %t_rgba16float Binding 6
+               OpDecorate %t_r32uint NonReadable
+               OpDecorate %t_r32uint DescriptorSet 0
+               OpDecorate %t_r32uint Binding 7
+               OpDecorate %t_r32sint NonReadable
+               OpDecorate %t_r32sint DescriptorSet 0
+               OpDecorate %t_r32sint Binding 8
+               OpDecorate %t_r32float NonReadable
+               OpDecorate %t_r32float DescriptorSet 0
+               OpDecorate %t_r32float Binding 9
+               OpDecorate %t_rg32uint NonReadable
+               OpDecorate %t_rg32uint DescriptorSet 0
+               OpDecorate %t_rg32uint Binding 10
+               OpDecorate %t_rg32sint NonReadable
+               OpDecorate %t_rg32sint DescriptorSet 0
+               OpDecorate %t_rg32sint Binding 11
+               OpDecorate %t_rg32float NonReadable
+               OpDecorate %t_rg32float DescriptorSet 0
+               OpDecorate %t_rg32float Binding 12
+               OpDecorate %t_rgba32uint NonReadable
+               OpDecorate %t_rgba32uint DescriptorSet 0
+               OpDecorate %t_rgba32uint Binding 13
+               OpDecorate %t_rgba32sint NonReadable
+               OpDecorate %t_rgba32sint DescriptorSet 0
+               OpDecorate %t_rgba32sint Binding 14
+               OpDecorate %t_rgba32float NonReadable
+               OpDecorate %t_rgba32float DescriptorSet 0
+               OpDecorate %t_rgba32float Binding 15
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 2D 0 1 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_r = OpVariable %_ptr_UniformConstant_3 UniformConstant
+%t_rgba8unorm = OpVariable %_ptr_UniformConstant_3 UniformConstant
           %7 = OpTypeImage %float 2D 0 1 0 2 Rgba8Snorm
 %_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_r = OpVariable %_ptr_UniformConstant_7 UniformConstant
+%t_rgba8snorm = OpVariable %_ptr_UniformConstant_7 UniformConstant
        %uint = OpTypeInt 32 0
          %10 = OpTypeImage %uint 2D 0 1 0 2 Rgba8ui
 %_ptr_UniformConstant_10 = OpTypePointer UniformConstant %10
-%t_rgba8uint_r = OpVariable %_ptr_UniformConstant_10 UniformConstant
+%t_rgba8uint = OpVariable %_ptr_UniformConstant_10 UniformConstant
         %int = OpTypeInt 32 1
          %14 = OpTypeImage %int 2D 0 1 0 2 Rgba8i
 %_ptr_UniformConstant_14 = OpTypePointer UniformConstant %14
-%t_rgba8sint_r = OpVariable %_ptr_UniformConstant_14 UniformConstant
+%t_rgba8sint = OpVariable %_ptr_UniformConstant_14 UniformConstant
          %18 = OpTypeImage %uint 2D 0 1 0 2 Rgba16ui
 %_ptr_UniformConstant_18 = OpTypePointer UniformConstant %18
-%t_rgba16uint_r = OpVariable %_ptr_UniformConstant_18 UniformConstant
+%t_rgba16uint = OpVariable %_ptr_UniformConstant_18 UniformConstant
          %21 = OpTypeImage %int 2D 0 1 0 2 Rgba16i
 %_ptr_UniformConstant_21 = OpTypePointer UniformConstant %21
-%t_rgba16sint_r = OpVariable %_ptr_UniformConstant_21 UniformConstant
+%t_rgba16sint = OpVariable %_ptr_UniformConstant_21 UniformConstant
          %24 = OpTypeImage %float 2D 0 1 0 2 Rgba16f
 %_ptr_UniformConstant_24 = OpTypePointer UniformConstant %24
-%t_rgba16float_r = OpVariable %_ptr_UniformConstant_24 UniformConstant
+%t_rgba16float = OpVariable %_ptr_UniformConstant_24 UniformConstant
          %27 = OpTypeImage %uint 2D 0 1 0 2 R32ui
 %_ptr_UniformConstant_27 = OpTypePointer UniformConstant %27
-%t_r32uint_r = OpVariable %_ptr_UniformConstant_27 UniformConstant
+  %t_r32uint = OpVariable %_ptr_UniformConstant_27 UniformConstant
          %30 = OpTypeImage %int 2D 0 1 0 2 R32i
 %_ptr_UniformConstant_30 = OpTypePointer UniformConstant %30
-%t_r32sint_r = OpVariable %_ptr_UniformConstant_30 UniformConstant
+  %t_r32sint = OpVariable %_ptr_UniformConstant_30 UniformConstant
          %33 = OpTypeImage %float 2D 0 1 0 2 R32f
 %_ptr_UniformConstant_33 = OpTypePointer UniformConstant %33
-%t_r32float_r = OpVariable %_ptr_UniformConstant_33 UniformConstant
+ %t_r32float = OpVariable %_ptr_UniformConstant_33 UniformConstant
          %36 = OpTypeImage %uint 2D 0 1 0 2 Rg32ui
 %_ptr_UniformConstant_36 = OpTypePointer UniformConstant %36
-%t_rg32uint_r = OpVariable %_ptr_UniformConstant_36 UniformConstant
+ %t_rg32uint = OpVariable %_ptr_UniformConstant_36 UniformConstant
          %39 = OpTypeImage %int 2D 0 1 0 2 Rg32i
 %_ptr_UniformConstant_39 = OpTypePointer UniformConstant %39
-%t_rg32sint_r = OpVariable %_ptr_UniformConstant_39 UniformConstant
+ %t_rg32sint = OpVariable %_ptr_UniformConstant_39 UniformConstant
          %42 = OpTypeImage %float 2D 0 1 0 2 Rg32f
 %_ptr_UniformConstant_42 = OpTypePointer UniformConstant %42
-%t_rg32float_r = OpVariable %_ptr_UniformConstant_42 UniformConstant
+%t_rg32float = OpVariable %_ptr_UniformConstant_42 UniformConstant
          %45 = OpTypeImage %uint 2D 0 1 0 2 Rgba32ui
 %_ptr_UniformConstant_45 = OpTypePointer UniformConstant %45
-%t_rgba32uint_r = OpVariable %_ptr_UniformConstant_45 UniformConstant
+%t_rgba32uint = OpVariable %_ptr_UniformConstant_45 UniformConstant
          %48 = OpTypeImage %int 2D 0 1 0 2 Rgba32i
 %_ptr_UniformConstant_48 = OpTypePointer UniformConstant %48
-%t_rgba32sint_r = OpVariable %_ptr_UniformConstant_48 UniformConstant
+%t_rgba32sint = OpVariable %_ptr_UniformConstant_48 UniformConstant
          %51 = OpTypeImage %float 2D 0 1 0 2 Rgba32f
 %_ptr_UniformConstant_51 = OpTypePointer UniformConstant %51
-%t_rgba32float_r = OpVariable %_ptr_UniformConstant_51 UniformConstant
-%_ptr_UniformConstant_3_0 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_w = OpVariable %_ptr_UniformConstant_3_0 UniformConstant
-%_ptr_UniformConstant_7_0 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_w = OpVariable %_ptr_UniformConstant_7_0 UniformConstant
-%_ptr_UniformConstant_10_0 = OpTypePointer UniformConstant %10
-%t_rgba8uint_w = OpVariable %_ptr_UniformConstant_10_0 UniformConstant
-%_ptr_UniformConstant_14_0 = OpTypePointer UniformConstant %14
-%t_rgba8sint_w = OpVariable %_ptr_UniformConstant_14_0 UniformConstant
-%_ptr_UniformConstant_18_0 = OpTypePointer UniformConstant %18
-%t_rgba16uint_w = OpVariable %_ptr_UniformConstant_18_0 UniformConstant
-%_ptr_UniformConstant_21_0 = OpTypePointer UniformConstant %21
-%t_rgba16sint_w = OpVariable %_ptr_UniformConstant_21_0 UniformConstant
-%_ptr_UniformConstant_24_0 = OpTypePointer UniformConstant %24
-%t_rgba16float_w = OpVariable %_ptr_UniformConstant_24_0 UniformConstant
-%_ptr_UniformConstant_27_0 = OpTypePointer UniformConstant %27
-%t_r32uint_w = OpVariable %_ptr_UniformConstant_27_0 UniformConstant
-%_ptr_UniformConstant_30_0 = OpTypePointer UniformConstant %30
-%t_r32sint_w = OpVariable %_ptr_UniformConstant_30_0 UniformConstant
-%_ptr_UniformConstant_33_0 = OpTypePointer UniformConstant %33
-%t_r32float_w = OpVariable %_ptr_UniformConstant_33_0 UniformConstant
-%_ptr_UniformConstant_36_0 = OpTypePointer UniformConstant %36
-%t_rg32uint_w = OpVariable %_ptr_UniformConstant_36_0 UniformConstant
-%_ptr_UniformConstant_39_0 = OpTypePointer UniformConstant %39
-%t_rg32sint_w = OpVariable %_ptr_UniformConstant_39_0 UniformConstant
-%_ptr_UniformConstant_42_0 = OpTypePointer UniformConstant %42
-%t_rg32float_w = OpVariable %_ptr_UniformConstant_42_0 UniformConstant
-%_ptr_UniformConstant_45_0 = OpTypePointer UniformConstant %45
-%t_rgba32uint_w = OpVariable %_ptr_UniformConstant_45_0 UniformConstant
-%_ptr_UniformConstant_48_0 = OpTypePointer UniformConstant %48
-%t_rgba32sint_w = OpVariable %_ptr_UniformConstant_48_0 UniformConstant
-%_ptr_UniformConstant_51_0 = OpTypePointer UniformConstant %51
-%t_rgba32float_w = OpVariable %_ptr_UniformConstant_51_0 UniformConstant
+%t_rgba32float = OpVariable %_ptr_UniformConstant_51 UniformConstant
        %void = OpTypeVoid
-         %84 = OpTypeFunction %void
-       %main = OpFunction %void None %84
-         %87 = OpLabel
+         %52 = OpTypeFunction %void
+       %main = OpFunction %void None %52
+         %55 = OpLabel
                OpReturn
                OpFunctionEnd
diff --git a/test/types/texture/storage/2d_array.wgsl.expected.wgsl b/test/types/texture/storage/2d_array.wgsl.expected.wgsl
index baa034b247..a002386e67 100644
--- a/test/types/texture/storage/2d_array.wgsl.expected.wgsl
+++ b/test/types/texture/storage/2d_array.wgsl.expected.wgsl
@@ -1,99 +1,51 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_2d_array<rgba8unorm, read>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_2d_array<rgba8unorm, write>;
 
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_2d_array<rgba8snorm, read>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_2d_array<rgba8snorm, write>;
 
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_2d_array<rgba8uint, read>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_2d_array<rgba8uint, write>;
 
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_2d_array<rgba8sint, read>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_2d_array<rgba8sint, write>;
 
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_2d_array<rgba16uint, read>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_2d_array<rgba16uint, write>;
 
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_2d_array<rgba16sint, read>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_2d_array<rgba16sint, write>;
 
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_2d_array<rgba16float, read>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_2d_array<rgba16float, write>;
 
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_2d_array<r32uint, read>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_2d_array<r32uint, write>;
 
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_2d_array<r32sint, read>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_2d_array<r32sint, write>;
 
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_2d_array<r32float, read>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_2d_array<r32float, write>;
 
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_2d_array<rg32uint, read>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_2d_array<rg32uint, write>;
 
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_2d_array<rg32sint, read>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_2d_array<rg32sint, write>;
 
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_2d_array<rg32float, read>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_2d_array<rg32float, write>;
 
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_2d_array<rgba32uint, read>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_2d_array<rgba32uint, write>;
 
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_2d_array<rgba32sint, read>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_2d_array<rgba32sint, write>;
 
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_2d_array<rgba32float, read>;
-
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_2d_array<rgba8unorm, write>;
-
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_2d_array<rgba8snorm, write>;
-
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_2d_array<rgba8uint, write>;
-
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_2d_array<rgba8sint, write>;
-
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_2d_array<rgba16uint, write>;
-
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_2d_array<rgba16sint, write>;
-
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_2d_array<rgba16float, write>;
-
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_2d_array<r32uint, write>;
-
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_2d_array<r32sint, write>;
-
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_2d_array<r32float, write>;
-
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_2d_array<rg32uint, write>;
-
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_2d_array<rg32sint, write>;
-
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_2d_array<rg32float, write>;
-
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_2d_array<rgba32uint, write>;
-
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_2d_array<rgba32sint, write>;
-
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_2d_array<rgba32float, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_2d_array<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/types/texture/storage/3d.wgsl b/test/types/texture/storage/3d.wgsl
index 9642b1371b..206cf2ab5e 100644
--- a/test/types/texture/storage/3d.wgsl
+++ b/test/types/texture/storage/3d.wgsl
@@ -1,68 +1,36 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_3d<rgba8unorm, read>;
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_3d<rgba8snorm, read>;
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_3d<rgba8uint, read>;
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_3d<rgba8sint, read>;
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_3d<rgba16uint, read>;
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_3d<rgba16sint, read>;
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_3d<rgba16float, read>;
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_3d<r32uint, read>;
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_3d<r32sint, read>;
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_3d<r32float, read>;
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_3d<rg32uint, read>;
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_3d<rg32sint, read>;
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_3d<rg32float, read>;
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_3d<rgba32uint, read>;
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_3d<rgba32sint, read>;
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_3d<rgba32float, read>;
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_3d<rgba8unorm, write>;
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_3d<rgba8snorm, write>;
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_3d<rgba8uint, write>;
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_3d<rgba8sint, write>;
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_3d<rgba16uint, write>;
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_3d<rgba16sint, write>;
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_3d<rgba16float, write>;
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_3d<r32uint, write>;
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_3d<r32sint, write>;
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_3d<r32float, write>;
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_3d<rg32uint, write>;
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_3d<rg32sint, write>;
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_3d<rg32float, write>;
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_3d<rgba32uint, write>;
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_3d<rgba32sint, write>;
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_3d<rgba32float, write>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_3d<rgba8unorm, write>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_3d<rgba8snorm, write>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_3d<rgba8uint, write>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_3d<rgba8sint, write>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_3d<rgba16uint, write>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_3d<rgba16sint, write>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_3d<rgba16float, write>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_3d<r32uint, write>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_3d<r32sint, write>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_3d<r32float, write>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_3d<rg32uint, write>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_3d<rg32sint, write>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_3d<rg32float, write>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_3d<rgba32uint, write>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_3d<rgba32sint, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_3d<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/types/texture/storage/3d.wgsl.expected.hlsl b/test/types/texture/storage/3d.wgsl.expected.hlsl
index ea26faabdb..246663780b 100644
--- a/test/types/texture/storage/3d.wgsl.expected.hlsl
+++ b/test/types/texture/storage/3d.wgsl.expected.hlsl
@@ -1,69 +1,37 @@
-Texture3D<float4> t_rgba8unorm_r : register(t0, space0);
-Texture3D<float4> t_rgba8snorm_r : register(t1, space0);
-Texture3D<uint4> t_rgba8uint_r : register(t2, space0);
-Texture3D<int4> t_rgba8sint_r : register(t3, space0);
-Texture3D<uint4> t_rgba16uint_r : register(t4, space0);
-Texture3D<int4> t_rgba16sint_r : register(t5, space0);
-Texture3D<float4> t_rgba16float_r : register(t6, space0);
-Texture3D<uint4> t_r32uint_r : register(t7, space0);
-Texture3D<int4> t_r32sint_r : register(t8, space0);
-Texture3D<float4> t_r32float_r : register(t9, space0);
-Texture3D<uint4> t_rg32uint_r : register(t10, space0);
-Texture3D<int4> t_rg32sint_r : register(t11, space0);
-Texture3D<float4> t_rg32float_r : register(t12, space0);
-Texture3D<uint4> t_rgba32uint_r : register(t13, space0);
-Texture3D<int4> t_rgba32sint_r : register(t14, space0);
-Texture3D<float4> t_rgba32float_r : register(t15, space0);
-RWTexture3D<float4> t_rgba8unorm_w : register(u50, space0);
-RWTexture3D<float4> t_rgba8snorm_w : register(u51, space0);
-RWTexture3D<uint4> t_rgba8uint_w : register(u52, space0);
-RWTexture3D<int4> t_rgba8sint_w : register(u53, space0);
-RWTexture3D<uint4> t_rgba16uint_w : register(u54, space0);
-RWTexture3D<int4> t_rgba16sint_w : register(u55, space0);
-RWTexture3D<float4> t_rgba16float_w : register(u56, space0);
-RWTexture3D<uint4> t_r32uint_w : register(u57, space0);
-RWTexture3D<int4> t_r32sint_w : register(u58, space0);
-RWTexture3D<float4> t_r32float_w : register(u59, space0);
-RWTexture3D<uint4> t_rg32uint_w : register(u60, space0);
-RWTexture3D<int4> t_rg32sint_w : register(u61, space0);
-RWTexture3D<float4> t_rg32float_w : register(u62, space0);
-RWTexture3D<uint4> t_rgba32uint_w : register(u63, space0);
-RWTexture3D<int4> t_rgba32sint_w : register(u64, space0);
-RWTexture3D<float4> t_rgba32float_w : register(u65, space0);
+RWTexture3D<float4> t_rgba8unorm : register(u0, space0);
+RWTexture3D<float4> t_rgba8snorm : register(u1, space0);
+RWTexture3D<uint4> t_rgba8uint : register(u2, space0);
+RWTexture3D<int4> t_rgba8sint : register(u3, space0);
+RWTexture3D<uint4> t_rgba16uint : register(u4, space0);
+RWTexture3D<int4> t_rgba16sint : register(u5, space0);
+RWTexture3D<float4> t_rgba16float : register(u6, space0);
+RWTexture3D<uint4> t_r32uint : register(u7, space0);
+RWTexture3D<int4> t_r32sint : register(u8, space0);
+RWTexture3D<float4> t_r32float : register(u9, space0);
+RWTexture3D<uint4> t_rg32uint : register(u10, space0);
+RWTexture3D<int4> t_rg32sint : register(u11, space0);
+RWTexture3D<float4> t_rg32float : register(u12, space0);
+RWTexture3D<uint4> t_rgba32uint : register(u13, space0);
+RWTexture3D<int4> t_rgba32sint : register(u14, space0);
+RWTexture3D<float4> t_rgba32float : register(u15, space0);
 
 [numthreads(1, 1, 1)]
 void main() {
-  t_rgba8unorm_r;
-  t_rgba8snorm_r;
-  t_rgba8uint_r;
-  t_rgba8sint_r;
-  t_rgba16uint_r;
-  t_rgba16sint_r;
-  t_rgba16float_r;
-  t_r32uint_r;
-  t_r32sint_r;
-  t_r32float_r;
-  t_rg32uint_r;
-  t_rg32sint_r;
-  t_rg32float_r;
-  t_rgba32uint_r;
-  t_rgba32sint_r;
-  t_rgba32float_r;
-  t_rgba8unorm_w;
-  t_rgba8snorm_w;
-  t_rgba8uint_w;
-  t_rgba8sint_w;
-  t_rgba16uint_w;
-  t_rgba16sint_w;
-  t_rgba16float_w;
-  t_r32uint_w;
-  t_r32sint_w;
-  t_r32float_w;
-  t_rg32uint_w;
-  t_rg32sint_w;
-  t_rg32float_w;
-  t_rgba32uint_w;
-  t_rgba32sint_w;
-  t_rgba32float_w;
+  t_rgba8unorm;
+  t_rgba8snorm;
+  t_rgba8uint;
+  t_rgba8sint;
+  t_rgba16uint;
+  t_rgba16sint;
+  t_rgba16float;
+  t_r32uint;
+  t_r32sint;
+  t_r32float;
+  t_rg32uint;
+  t_rg32sint;
+  t_rg32float;
+  t_rgba32uint;
+  t_rgba32sint;
+  t_rgba32float;
   return;
 }
diff --git a/test/types/texture/storage/3d.wgsl.expected.msl b/test/types/texture/storage/3d.wgsl.expected.msl
index dc693f8b02..cfcba07064 100644
--- a/test/types/texture/storage/3d.wgsl.expected.msl
+++ b/test/types/texture/storage/3d.wgsl.expected.msl
@@ -1,7 +1,7 @@
 #include <metal_stdlib>
 
 using namespace metal;
-kernel void tint_symbol(texture3d<float, access::read> tint_symbol_1 [[texture(0)]], texture3d<float, access::read> tint_symbol_2 [[texture(1)]], texture3d<uint, access::read> tint_symbol_3 [[texture(2)]], texture3d<int, access::read> tint_symbol_4 [[texture(3)]], texture3d<uint, access::read> tint_symbol_5 [[texture(4)]], texture3d<int, access::read> tint_symbol_6 [[texture(5)]], texture3d<float, access::read> tint_symbol_7 [[texture(6)]], texture3d<uint, access::read> tint_symbol_8 [[texture(7)]], texture3d<int, access::read> tint_symbol_9 [[texture(8)]], texture3d<float, access::read> tint_symbol_10 [[texture(9)]], texture3d<uint, access::read> tint_symbol_11 [[texture(10)]], texture3d<int, access::read> tint_symbol_12 [[texture(11)]], texture3d<float, access::read> tint_symbol_13 [[texture(12)]], texture3d<uint, access::read> tint_symbol_14 [[texture(13)]], texture3d<int, access::read> tint_symbol_15 [[texture(14)]], texture3d<float, access::read> tint_symbol_16 [[texture(15)]], texture3d<float, access::write> tint_symbol_17 [[texture(16)]], texture3d<float, access::write> tint_symbol_18 [[texture(17)]], texture3d<uint, access::write> tint_symbol_19 [[texture(18)]], texture3d<int, access::write> tint_symbol_20 [[texture(19)]], texture3d<uint, access::write> tint_symbol_21 [[texture(20)]], texture3d<int, access::write> tint_symbol_22 [[texture(21)]], texture3d<float, access::write> tint_symbol_23 [[texture(22)]], texture3d<uint, access::write> tint_symbol_24 [[texture(23)]], texture3d<int, access::write> tint_symbol_25 [[texture(24)]], texture3d<float, access::write> tint_symbol_26 [[texture(25)]], texture3d<uint, access::write> tint_symbol_27 [[texture(26)]], texture3d<int, access::write> tint_symbol_28 [[texture(27)]], texture3d<float, access::write> tint_symbol_29 [[texture(28)]], texture3d<uint, access::write> tint_symbol_30 [[texture(29)]], texture3d<int, access::write> tint_symbol_31 [[texture(30)]], texture3d<float, access::write> tint_symbol_32 [[texture(31)]]) {
+kernel void tint_symbol(texture3d<float, access::write> tint_symbol_1 [[texture(0)]], texture3d<float, access::write> tint_symbol_2 [[texture(1)]], texture3d<uint, access::write> tint_symbol_3 [[texture(2)]], texture3d<int, access::write> tint_symbol_4 [[texture(3)]], texture3d<uint, access::write> tint_symbol_5 [[texture(4)]], texture3d<int, access::write> tint_symbol_6 [[texture(5)]], texture3d<float, access::write> tint_symbol_7 [[texture(6)]], texture3d<uint, access::write> tint_symbol_8 [[texture(7)]], texture3d<int, access::write> tint_symbol_9 [[texture(8)]], texture3d<float, access::write> tint_symbol_10 [[texture(9)]], texture3d<uint, access::write> tint_symbol_11 [[texture(10)]], texture3d<int, access::write> tint_symbol_12 [[texture(11)]], texture3d<float, access::write> tint_symbol_13 [[texture(12)]], texture3d<uint, access::write> tint_symbol_14 [[texture(13)]], texture3d<int, access::write> tint_symbol_15 [[texture(14)]], texture3d<float, access::write> tint_symbol_16 [[texture(15)]]) {
   (void) tint_symbol_1;
   (void) tint_symbol_2;
   (void) tint_symbol_3;
@@ -18,22 +18,6 @@ kernel void tint_symbol(texture3d<float, access::read> tint_symbol_1 [[texture(0
   (void) tint_symbol_14;
   (void) tint_symbol_15;
   (void) tint_symbol_16;
-  (void) tint_symbol_17;
-  (void) tint_symbol_18;
-  (void) tint_symbol_19;
-  (void) tint_symbol_20;
-  (void) tint_symbol_21;
-  (void) tint_symbol_22;
-  (void) tint_symbol_23;
-  (void) tint_symbol_24;
-  (void) tint_symbol_25;
-  (void) tint_symbol_26;
-  (void) tint_symbol_27;
-  (void) tint_symbol_28;
-  (void) tint_symbol_29;
-  (void) tint_symbol_30;
-  (void) tint_symbol_31;
-  (void) tint_symbol_32;
   return;
 }
 
diff --git a/test/types/texture/storage/3d.wgsl.expected.spvasm b/test/types/texture/storage/3d.wgsl.expected.spvasm
index 2d03bbdce0..effb6fd0d7 100644
--- a/test/types/texture/storage/3d.wgsl.expected.spvasm
+++ b/test/types/texture/storage/3d.wgsl.expected.spvasm
@@ -1,228 +1,132 @@
 ; SPIR-V
 ; Version: 1.3
 ; Generator: Google Tint Compiler; 0
-; Bound: 120
+; Bound: 72
 ; Schema: 0
                OpCapability Shader
                OpCapability StorageImageExtendedFormats
                OpMemoryModel Logical GLSL450
                OpEntryPoint GLCompute %main "main"
                OpExecutionMode %main LocalSize 1 1 1
-               OpName %t_rgba8unorm_r "t_rgba8unorm_r"
-               OpName %t_rgba8snorm_r "t_rgba8snorm_r"
-               OpName %t_rgba8uint_r "t_rgba8uint_r"
-               OpName %t_rgba8sint_r "t_rgba8sint_r"
-               OpName %t_rgba16uint_r "t_rgba16uint_r"
-               OpName %t_rgba16sint_r "t_rgba16sint_r"
-               OpName %t_rgba16float_r "t_rgba16float_r"
-               OpName %t_r32uint_r "t_r32uint_r"
-               OpName %t_r32sint_r "t_r32sint_r"
-               OpName %t_r32float_r "t_r32float_r"
-               OpName %t_rg32uint_r "t_rg32uint_r"
-               OpName %t_rg32sint_r "t_rg32sint_r"
-               OpName %t_rg32float_r "t_rg32float_r"
-               OpName %t_rgba32uint_r "t_rgba32uint_r"
-               OpName %t_rgba32sint_r "t_rgba32sint_r"
-               OpName %t_rgba32float_r "t_rgba32float_r"
-               OpName %t_rgba8unorm_w "t_rgba8unorm_w"
-               OpName %t_rgba8snorm_w "t_rgba8snorm_w"
-               OpName %t_rgba8uint_w "t_rgba8uint_w"
-               OpName %t_rgba8sint_w "t_rgba8sint_w"
-               OpName %t_rgba16uint_w "t_rgba16uint_w"
-               OpName %t_rgba16sint_w "t_rgba16sint_w"
-               OpName %t_rgba16float_w "t_rgba16float_w"
-               OpName %t_r32uint_w "t_r32uint_w"
-               OpName %t_r32sint_w "t_r32sint_w"
-               OpName %t_r32float_w "t_r32float_w"
-               OpName %t_rg32uint_w "t_rg32uint_w"
-               OpName %t_rg32sint_w "t_rg32sint_w"
-               OpName %t_rg32float_w "t_rg32float_w"
-               OpName %t_rgba32uint_w "t_rgba32uint_w"
-               OpName %t_rgba32sint_w "t_rgba32sint_w"
-               OpName %t_rgba32float_w "t_rgba32float_w"
+               OpName %t_rgba8unorm "t_rgba8unorm"
+               OpName %t_rgba8snorm "t_rgba8snorm"
+               OpName %t_rgba8uint "t_rgba8uint"
+               OpName %t_rgba8sint "t_rgba8sint"
+               OpName %t_rgba16uint "t_rgba16uint"
+               OpName %t_rgba16sint "t_rgba16sint"
+               OpName %t_rgba16float "t_rgba16float"
+               OpName %t_r32uint "t_r32uint"
+               OpName %t_r32sint "t_r32sint"
+               OpName %t_r32float "t_r32float"
+               OpName %t_rg32uint "t_rg32uint"
+               OpName %t_rg32sint "t_rg32sint"
+               OpName %t_rg32float "t_rg32float"
+               OpName %t_rgba32uint "t_rgba32uint"
+               OpName %t_rgba32sint "t_rgba32sint"
+               OpName %t_rgba32float "t_rgba32float"
                OpName %main "main"
-               OpDecorate %t_rgba8unorm_r NonWritable
-               OpDecorate %t_rgba8unorm_r DescriptorSet 0
-               OpDecorate %t_rgba8unorm_r Binding 0
-               OpDecorate %t_rgba8snorm_r NonWritable
-               OpDecorate %t_rgba8snorm_r DescriptorSet 0
-               OpDecorate %t_rgba8snorm_r Binding 1
-               OpDecorate %t_rgba8uint_r NonWritable
-               OpDecorate %t_rgba8uint_r DescriptorSet 0
-               OpDecorate %t_rgba8uint_r Binding 2
-               OpDecorate %t_rgba8sint_r NonWritable
-               OpDecorate %t_rgba8sint_r DescriptorSet 0
-               OpDecorate %t_rgba8sint_r Binding 3
-               OpDecorate %t_rgba16uint_r NonWritable
-               OpDecorate %t_rgba16uint_r DescriptorSet 0
-               OpDecorate %t_rgba16uint_r Binding 4
-               OpDecorate %t_rgba16sint_r NonWritable
-               OpDecorate %t_rgba16sint_r DescriptorSet 0
-               OpDecorate %t_rgba16sint_r Binding 5
-               OpDecorate %t_rgba16float_r NonWritable
-               OpDecorate %t_rgba16float_r DescriptorSet 0
-               OpDecorate %t_rgba16float_r Binding 6
-               OpDecorate %t_r32uint_r NonWritable
-               OpDecorate %t_r32uint_r DescriptorSet 0
-               OpDecorate %t_r32uint_r Binding 7
-               OpDecorate %t_r32sint_r NonWritable
-               OpDecorate %t_r32sint_r DescriptorSet 0
-               OpDecorate %t_r32sint_r Binding 8
-               OpDecorate %t_r32float_r NonWritable
-               OpDecorate %t_r32float_r DescriptorSet 0
-               OpDecorate %t_r32float_r Binding 9
-               OpDecorate %t_rg32uint_r NonWritable
-               OpDecorate %t_rg32uint_r DescriptorSet 0
-               OpDecorate %t_rg32uint_r Binding 10
-               OpDecorate %t_rg32sint_r NonWritable
-               OpDecorate %t_rg32sint_r DescriptorSet 0
-               OpDecorate %t_rg32sint_r Binding 11
-               OpDecorate %t_rg32float_r NonWritable
-               OpDecorate %t_rg32float_r DescriptorSet 0
-               OpDecorate %t_rg32float_r Binding 12
-               OpDecorate %t_rgba32uint_r NonWritable
-               OpDecorate %t_rgba32uint_r DescriptorSet 0
-               OpDecorate %t_rgba32uint_r Binding 13
-               OpDecorate %t_rgba32sint_r NonWritable
-               OpDecorate %t_rgba32sint_r DescriptorSet 0
-               OpDecorate %t_rgba32sint_r Binding 14
-               OpDecorate %t_rgba32float_r NonWritable
-               OpDecorate %t_rgba32float_r DescriptorSet 0
-               OpDecorate %t_rgba32float_r Binding 15
-               OpDecorate %t_rgba8unorm_w NonReadable
-               OpDecorate %t_rgba8unorm_w DescriptorSet 0
-               OpDecorate %t_rgba8unorm_w Binding 50
-               OpDecorate %t_rgba8snorm_w NonReadable
-               OpDecorate %t_rgba8snorm_w DescriptorSet 0
-               OpDecorate %t_rgba8snorm_w Binding 51
-               OpDecorate %t_rgba8uint_w NonReadable
-               OpDecorate %t_rgba8uint_w DescriptorSet 0
-               OpDecorate %t_rgba8uint_w Binding 52
-               OpDecorate %t_rgba8sint_w NonReadable
-               OpDecorate %t_rgba8sint_w DescriptorSet 0
-               OpDecorate %t_rgba8sint_w Binding 53
-               OpDecorate %t_rgba16uint_w NonReadable
-               OpDecorate %t_rgba16uint_w DescriptorSet 0
-               OpDecorate %t_rgba16uint_w Binding 54
-               OpDecorate %t_rgba16sint_w NonReadable
-               OpDecorate %t_rgba16sint_w DescriptorSet 0
-               OpDecorate %t_rgba16sint_w Binding 55
-               OpDecorate %t_rgba16float_w NonReadable
-               OpDecorate %t_rgba16float_w DescriptorSet 0
-               OpDecorate %t_rgba16float_w Binding 56
-               OpDecorate %t_r32uint_w NonReadable
-               OpDecorate %t_r32uint_w DescriptorSet 0
-               OpDecorate %t_r32uint_w Binding 57
-               OpDecorate %t_r32sint_w NonReadable
-               OpDecorate %t_r32sint_w DescriptorSet 0
-               OpDecorate %t_r32sint_w Binding 58
-               OpDecorate %t_r32float_w NonReadable
-               OpDecorate %t_r32float_w DescriptorSet 0
-               OpDecorate %t_r32float_w Binding 59
-               OpDecorate %t_rg32uint_w NonReadable
-               OpDecorate %t_rg32uint_w DescriptorSet 0
-               OpDecorate %t_rg32uint_w Binding 60
-               OpDecorate %t_rg32sint_w NonReadable
-               OpDecorate %t_rg32sint_w DescriptorSet 0
-               OpDecorate %t_rg32sint_w Binding 61
-               OpDecorate %t_rg32float_w NonReadable
-               OpDecorate %t_rg32float_w DescriptorSet 0
-               OpDecorate %t_rg32float_w Binding 62
-               OpDecorate %t_rgba32uint_w NonReadable
-               OpDecorate %t_rgba32uint_w DescriptorSet 0
-               OpDecorate %t_rgba32uint_w Binding 63
-               OpDecorate %t_rgba32sint_w NonReadable
-               OpDecorate %t_rgba32sint_w DescriptorSet 0
-               OpDecorate %t_rgba32sint_w Binding 64
-               OpDecorate %t_rgba32float_w NonReadable
-               OpDecorate %t_rgba32float_w DescriptorSet 0
-               OpDecorate %t_rgba32float_w Binding 65
+               OpDecorate %t_rgba8unorm NonReadable
+               OpDecorate %t_rgba8unorm DescriptorSet 0
+               OpDecorate %t_rgba8unorm Binding 0
+               OpDecorate %t_rgba8snorm NonReadable
+               OpDecorate %t_rgba8snorm DescriptorSet 0
+               OpDecorate %t_rgba8snorm Binding 1
+               OpDecorate %t_rgba8uint NonReadable
+               OpDecorate %t_rgba8uint DescriptorSet 0
+               OpDecorate %t_rgba8uint Binding 2
+               OpDecorate %t_rgba8sint NonReadable
+               OpDecorate %t_rgba8sint DescriptorSet 0
+               OpDecorate %t_rgba8sint Binding 3
+               OpDecorate %t_rgba16uint NonReadable
+               OpDecorate %t_rgba16uint DescriptorSet 0
+               OpDecorate %t_rgba16uint Binding 4
+               OpDecorate %t_rgba16sint NonReadable
+               OpDecorate %t_rgba16sint DescriptorSet 0
+               OpDecorate %t_rgba16sint Binding 5
+               OpDecorate %t_rgba16float NonReadable
+               OpDecorate %t_rgba16float DescriptorSet 0
+               OpDecorate %t_rgba16float Binding 6
+               OpDecorate %t_r32uint NonReadable
+               OpDecorate %t_r32uint DescriptorSet 0
+               OpDecorate %t_r32uint Binding 7
+               OpDecorate %t_r32sint NonReadable
+               OpDecorate %t_r32sint DescriptorSet 0
+               OpDecorate %t_r32sint Binding 8
+               OpDecorate %t_r32float NonReadable
+               OpDecorate %t_r32float DescriptorSet 0
+               OpDecorate %t_r32float Binding 9
+               OpDecorate %t_rg32uint NonReadable
+               OpDecorate %t_rg32uint DescriptorSet 0
+               OpDecorate %t_rg32uint Binding 10
+               OpDecorate %t_rg32sint NonReadable
+               OpDecorate %t_rg32sint DescriptorSet 0
+               OpDecorate %t_rg32sint Binding 11
+               OpDecorate %t_rg32float NonReadable
+               OpDecorate %t_rg32float DescriptorSet 0
+               OpDecorate %t_rg32float Binding 12
+               OpDecorate %t_rgba32uint NonReadable
+               OpDecorate %t_rgba32uint DescriptorSet 0
+               OpDecorate %t_rgba32uint Binding 13
+               OpDecorate %t_rgba32sint NonReadable
+               OpDecorate %t_rgba32sint DescriptorSet 0
+               OpDecorate %t_rgba32sint Binding 14
+               OpDecorate %t_rgba32float NonReadable
+               OpDecorate %t_rgba32float DescriptorSet 0
+               OpDecorate %t_rgba32float Binding 15
       %float = OpTypeFloat 32
           %3 = OpTypeImage %float 3D 0 0 0 2 Rgba8
 %_ptr_UniformConstant_3 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_r = OpVariable %_ptr_UniformConstant_3 UniformConstant
+%t_rgba8unorm = OpVariable %_ptr_UniformConstant_3 UniformConstant
           %7 = OpTypeImage %float 3D 0 0 0 2 Rgba8Snorm
 %_ptr_UniformConstant_7 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_r = OpVariable %_ptr_UniformConstant_7 UniformConstant
+%t_rgba8snorm = OpVariable %_ptr_UniformConstant_7 UniformConstant
        %uint = OpTypeInt 32 0
          %10 = OpTypeImage %uint 3D 0 0 0 2 Rgba8ui
 %_ptr_UniformConstant_10 = OpTypePointer UniformConstant %10
-%t_rgba8uint_r = OpVariable %_ptr_UniformConstant_10 UniformConstant
+%t_rgba8uint = OpVariable %_ptr_UniformConstant_10 UniformConstant
         %int = OpTypeInt 32 1
          %14 = OpTypeImage %int 3D 0 0 0 2 Rgba8i
 %_ptr_UniformConstant_14 = OpTypePointer UniformConstant %14
-%t_rgba8sint_r = OpVariable %_ptr_UniformConstant_14 UniformConstant
+%t_rgba8sint = OpVariable %_ptr_UniformConstant_14 UniformConstant
          %18 = OpTypeImage %uint 3D 0 0 0 2 Rgba16ui
 %_ptr_UniformConstant_18 = OpTypePointer UniformConstant %18
-%t_rgba16uint_r = OpVariable %_ptr_UniformConstant_18 UniformConstant
+%t_rgba16uint = OpVariable %_ptr_UniformConstant_18 UniformConstant
          %21 = OpTypeImage %int 3D 0 0 0 2 Rgba16i
 %_ptr_UniformConstant_21 = OpTypePointer UniformConstant %21
-%t_rgba16sint_r = OpVariable %_ptr_UniformConstant_21 UniformConstant
+%t_rgba16sint = OpVariable %_ptr_UniformConstant_21 UniformConstant
          %24 = OpTypeImage %float 3D 0 0 0 2 Rgba16f
 %_ptr_UniformConstant_24 = OpTypePointer UniformConstant %24
-%t_rgba16float_r = OpVariable %_ptr_UniformConstant_24 UniformConstant
+%t_rgba16float = OpVariable %_ptr_UniformConstant_24 UniformConstant
          %27 = OpTypeImage %uint 3D 0 0 0 2 R32ui
 %_ptr_UniformConstant_27 = OpTypePointer UniformConstant %27
-%t_r32uint_r = OpVariable %_ptr_UniformConstant_27 UniformConstant
+  %t_r32uint = OpVariable %_ptr_UniformConstant_27 UniformConstant
          %30 = OpTypeImage %int 3D 0 0 0 2 R32i
 %_ptr_UniformConstant_30 = OpTypePointer UniformConstant %30
-%t_r32sint_r = OpVariable %_ptr_UniformConstant_30 UniformConstant
+  %t_r32sint = OpVariable %_ptr_UniformConstant_30 UniformConstant
          %33 = OpTypeImage %float 3D 0 0 0 2 R32f
 %_ptr_UniformConstant_33 = OpTypePointer UniformConstant %33
-%t_r32float_r = OpVariable %_ptr_UniformConstant_33 UniformConstant
+ %t_r32float = OpVariable %_ptr_UniformConstant_33 UniformConstant
          %36 = OpTypeImage %uint 3D 0 0 0 2 Rg32ui
 %_ptr_UniformConstant_36 = OpTypePointer UniformConstant %36
-%t_rg32uint_r = OpVariable %_ptr_UniformConstant_36 UniformConstant
+ %t_rg32uint = OpVariable %_ptr_UniformConstant_36 UniformConstant
          %39 = OpTypeImage %int 3D 0 0 0 2 Rg32i
 %_ptr_UniformConstant_39 = OpTypePointer UniformConstant %39
-%t_rg32sint_r = OpVariable %_ptr_UniformConstant_39 UniformConstant
+ %t_rg32sint = OpVariable %_ptr_UniformConstant_39 UniformConstant
          %42 = OpTypeImage %float 3D 0 0 0 2 Rg32f
 %_ptr_UniformConstant_42 = OpTypePointer UniformConstant %42
-%t_rg32float_r = OpVariable %_ptr_UniformConstant_42 UniformConstant
+%t_rg32float = OpVariable %_ptr_UniformConstant_42 UniformConstant
          %45 = OpTypeImage %uint 3D 0 0 0 2 Rgba32ui
 %_ptr_UniformConstant_45 = OpTypePointer UniformConstant %45
-%t_rgba32uint_r = OpVariable %_ptr_UniformConstant_45 UniformConstant
+%t_rgba32uint = OpVariable %_ptr_UniformConstant_45 UniformConstant
          %48 = OpTypeImage %int 3D 0 0 0 2 Rgba32i
 %_ptr_UniformConstant_48 = OpTypePointer UniformConstant %48
-%t_rgba32sint_r = OpVariable %_ptr_UniformConstant_48 UniformConstant
+%t_rgba32sint = OpVariable %_ptr_UniformConstant_48 UniformConstant
          %51 = OpTypeImage %float 3D 0 0 0 2 Rgba32f
 %_ptr_UniformConstant_51 = OpTypePointer UniformConstant %51
-%t_rgba32float_r = OpVariable %_ptr_UniformConstant_51 UniformConstant
-%_ptr_UniformConstant_3_0 = OpTypePointer UniformConstant %3
-%t_rgba8unorm_w = OpVariable %_ptr_UniformConstant_3_0 UniformConstant
-%_ptr_UniformConstant_7_0 = OpTypePointer UniformConstant %7
-%t_rgba8snorm_w = OpVariable %_ptr_UniformConstant_7_0 UniformConstant
-%_ptr_UniformConstant_10_0 = OpTypePointer UniformConstant %10
-%t_rgba8uint_w = OpVariable %_ptr_UniformConstant_10_0 UniformConstant
-%_ptr_UniformConstant_14_0 = OpTypePointer UniformConstant %14
-%t_rgba8sint_w = OpVariable %_ptr_UniformConstant_14_0 UniformConstant
-%_ptr_UniformConstant_18_0 = OpTypePointer UniformConstant %18
-%t_rgba16uint_w = OpVariable %_ptr_UniformConstant_18_0 UniformConstant
-%_ptr_UniformConstant_21_0 = OpTypePointer UniformConstant %21
-%t_rgba16sint_w = OpVariable %_ptr_UniformConstant_21_0 UniformConstant
-%_ptr_UniformConstant_24_0 = OpTypePointer UniformConstant %24
-%t_rgba16float_w = OpVariable %_ptr_UniformConstant_24_0 UniformConstant
-%_ptr_UniformConstant_27_0 = OpTypePointer UniformConstant %27
-%t_r32uint_w = OpVariable %_ptr_UniformConstant_27_0 UniformConstant
-%_ptr_UniformConstant_30_0 = OpTypePointer UniformConstant %30
-%t_r32sint_w = OpVariable %_ptr_UniformConstant_30_0 UniformConstant
-%_ptr_UniformConstant_33_0 = OpTypePointer UniformConstant %33
-%t_r32float_w = OpVariable %_ptr_UniformConstant_33_0 UniformConstant
-%_ptr_UniformConstant_36_0 = OpTypePointer UniformConstant %36
-%t_rg32uint_w = OpVariable %_ptr_UniformConstant_36_0 UniformConstant
-%_ptr_UniformConstant_39_0 = OpTypePointer UniformConstant %39
-%t_rg32sint_w = OpVariable %_ptr_UniformConstant_39_0 UniformConstant
-%_ptr_UniformConstant_42_0 = OpTypePointer UniformConstant %42
-%t_rg32float_w = OpVariable %_ptr_UniformConstant_42_0 UniformConstant
-%_ptr_UniformConstant_45_0 = OpTypePointer UniformConstant %45
-%t_rgba32uint_w = OpVariable %_ptr_UniformConstant_45_0 UniformConstant
-%_ptr_UniformConstant_48_0 = OpTypePointer UniformConstant %48
-%t_rgba32sint_w = OpVariable %_ptr_UniformConstant_48_0 UniformConstant
-%_ptr_UniformConstant_51_0 = OpTypePointer UniformConstant %51
-%t_rgba32float_w = OpVariable %_ptr_UniformConstant_51_0 UniformConstant
+%t_rgba32float = OpVariable %_ptr_UniformConstant_51 UniformConstant
        %void = OpTypeVoid
-         %84 = OpTypeFunction %void
-       %main = OpFunction %void None %84
-         %87 = OpLabel
+         %52 = OpTypeFunction %void
+       %main = OpFunction %void None %52
+         %55 = OpLabel
                OpReturn
                OpFunctionEnd
diff --git a/test/types/texture/storage/3d.wgsl.expected.wgsl b/test/types/texture/storage/3d.wgsl.expected.wgsl
index 4a02247694..42d79ae826 100644
--- a/test/types/texture/storage/3d.wgsl.expected.wgsl
+++ b/test/types/texture/storage/3d.wgsl.expected.wgsl
@@ -1,99 +1,51 @@
-[[group(0), binding(0)]] var t_rgba8unorm_r : texture_storage_3d<rgba8unorm, read>;
+[[group(0), binding(0)]] var t_rgba8unorm : texture_storage_3d<rgba8unorm, write>;
 
-[[group(0), binding(1)]] var t_rgba8snorm_r : texture_storage_3d<rgba8snorm, read>;
+[[group(0), binding(1)]] var t_rgba8snorm : texture_storage_3d<rgba8snorm, write>;
 
-[[group(0), binding(2)]] var t_rgba8uint_r : texture_storage_3d<rgba8uint, read>;
+[[group(0), binding(2)]] var t_rgba8uint : texture_storage_3d<rgba8uint, write>;
 
-[[group(0), binding(3)]] var t_rgba8sint_r : texture_storage_3d<rgba8sint, read>;
+[[group(0), binding(3)]] var t_rgba8sint : texture_storage_3d<rgba8sint, write>;
 
-[[group(0), binding(4)]] var t_rgba16uint_r : texture_storage_3d<rgba16uint, read>;
+[[group(0), binding(4)]] var t_rgba16uint : texture_storage_3d<rgba16uint, write>;
 
-[[group(0), binding(5)]] var t_rgba16sint_r : texture_storage_3d<rgba16sint, read>;
+[[group(0), binding(5)]] var t_rgba16sint : texture_storage_3d<rgba16sint, write>;
 
-[[group(0), binding(6)]] var t_rgba16float_r : texture_storage_3d<rgba16float, read>;
+[[group(0), binding(6)]] var t_rgba16float : texture_storage_3d<rgba16float, write>;
 
-[[group(0), binding(7)]] var t_r32uint_r : texture_storage_3d<r32uint, read>;
+[[group(0), binding(7)]] var t_r32uint : texture_storage_3d<r32uint, write>;
 
-[[group(0), binding(8)]] var t_r32sint_r : texture_storage_3d<r32sint, read>;
+[[group(0), binding(8)]] var t_r32sint : texture_storage_3d<r32sint, write>;
 
-[[group(0), binding(9)]] var t_r32float_r : texture_storage_3d<r32float, read>;
+[[group(0), binding(9)]] var t_r32float : texture_storage_3d<r32float, write>;
 
-[[group(0), binding(10)]] var t_rg32uint_r : texture_storage_3d<rg32uint, read>;
+[[group(0), binding(10)]] var t_rg32uint : texture_storage_3d<rg32uint, write>;
 
-[[group(0), binding(11)]] var t_rg32sint_r : texture_storage_3d<rg32sint, read>;
+[[group(0), binding(11)]] var t_rg32sint : texture_storage_3d<rg32sint, write>;
 
-[[group(0), binding(12)]] var t_rg32float_r : texture_storage_3d<rg32float, read>;
+[[group(0), binding(12)]] var t_rg32float : texture_storage_3d<rg32float, write>;
 
-[[group(0), binding(13)]] var t_rgba32uint_r : texture_storage_3d<rgba32uint, read>;
+[[group(0), binding(13)]] var t_rgba32uint : texture_storage_3d<rgba32uint, write>;
 
-[[group(0), binding(14)]] var t_rgba32sint_r : texture_storage_3d<rgba32sint, read>;
+[[group(0), binding(14)]] var t_rgba32sint : texture_storage_3d<rgba32sint, write>;
 
-[[group(0), binding(15)]] var t_rgba32float_r : texture_storage_3d<rgba32float, read>;
-
-[[group(0), binding(50)]] var t_rgba8unorm_w : texture_storage_3d<rgba8unorm, write>;
-
-[[group(0), binding(51)]] var t_rgba8snorm_w : texture_storage_3d<rgba8snorm, write>;
-
-[[group(0), binding(52)]] var t_rgba8uint_w : texture_storage_3d<rgba8uint, write>;
-
-[[group(0), binding(53)]] var t_rgba8sint_w : texture_storage_3d<rgba8sint, write>;
-
-[[group(0), binding(54)]] var t_rgba16uint_w : texture_storage_3d<rgba16uint, write>;
-
-[[group(0), binding(55)]] var t_rgba16sint_w : texture_storage_3d<rgba16sint, write>;
-
-[[group(0), binding(56)]] var t_rgba16float_w : texture_storage_3d<rgba16float, write>;
-
-[[group(0), binding(57)]] var t_r32uint_w : texture_storage_3d<r32uint, write>;
-
-[[group(0), binding(58)]] var t_r32sint_w : texture_storage_3d<r32sint, write>;
-
-[[group(0), binding(59)]] var t_r32float_w : texture_storage_3d<r32float, write>;
-
-[[group(0), binding(60)]] var t_rg32uint_w : texture_storage_3d<rg32uint, write>;
-
-[[group(0), binding(61)]] var t_rg32sint_w : texture_storage_3d<rg32sint, write>;
-
-[[group(0), binding(62)]] var t_rg32float_w : texture_storage_3d<rg32float, write>;
-
-[[group(0), binding(63)]] var t_rgba32uint_w : texture_storage_3d<rgba32uint, write>;
-
-[[group(0), binding(64)]] var t_rgba32sint_w : texture_storage_3d<rgba32sint, write>;
-
-[[group(0), binding(65)]] var t_rgba32float_w : texture_storage_3d<rgba32float, write>;
+[[group(0), binding(15)]] var t_rgba32float : texture_storage_3d<rgba32float, write>;
 
 [[stage(compute), workgroup_size(1)]]
 fn main() {
-  ignore(t_rgba8unorm_r);
-  ignore(t_rgba8snorm_r);
-  ignore(t_rgba8uint_r);
-  ignore(t_rgba8sint_r);
-  ignore(t_rgba16uint_r);
-  ignore(t_rgba16sint_r);
-  ignore(t_rgba16float_r);
-  ignore(t_r32uint_r);
-  ignore(t_r32sint_r);
-  ignore(t_r32float_r);
-  ignore(t_rg32uint_r);
-  ignore(t_rg32sint_r);
-  ignore(t_rg32float_r);
-  ignore(t_rgba32uint_r);
-  ignore(t_rgba32sint_r);
-  ignore(t_rgba32float_r);
-  ignore(t_rgba8unorm_w);
-  ignore(t_rgba8snorm_w);
-  ignore(t_rgba8uint_w);
-  ignore(t_rgba8sint_w);
-  ignore(t_rgba16uint_w);
-  ignore(t_rgba16sint_w);
-  ignore(t_rgba16float_w);
-  ignore(t_r32uint_w);
-  ignore(t_r32sint_w);
-  ignore(t_r32float_w);
-  ignore(t_rg32uint_w);
-  ignore(t_rg32sint_w);
-  ignore(t_rg32float_w);
-  ignore(t_rgba32uint_w);
-  ignore(t_rgba32sint_w);
-  ignore(t_rgba32float_w);
+  ignore(t_rgba8unorm);
+  ignore(t_rgba8snorm);
+  ignore(t_rgba8uint);
+  ignore(t_rgba8sint);
+  ignore(t_rgba16uint);
+  ignore(t_rgba16sint);
+  ignore(t_rgba16float);
+  ignore(t_r32uint);
+  ignore(t_r32sint);
+  ignore(t_r32float);
+  ignore(t_rg32uint);
+  ignore(t_rg32sint);
+  ignore(t_rg32float);
+  ignore(t_rgba32uint);
+  ignore(t_rgba32sint);
+  ignore(t_rgba32float);
 }
diff --git a/test/vk-gl-cts/rasterization/line_continuity/line-strip/1.wgsl b/test/vk-gl-cts/rasterization/line_continuity/line-strip/1.wgsl
index 85b125f452..702b11784d 100644
--- a/test/vk-gl-cts/rasterization/line_continuity/line-strip/1.wgsl
+++ b/test/vk-gl-cts/rasterization/line_continuity/line-strip/1.wgsl
@@ -1,12 +1,12 @@
 var<private> color_out : vec4<f32>;
 
-[[group(0), binding(0)]] var texture : texture_storage_2d<rgba8unorm, read>;
+[[group(0), binding(0)]] var texture : texture_2d<f32>;
 
 var<private> gl_FragCoord : vec4<f32>;
 
 fn main_1() {
   let x_19 : vec4<f32> = gl_FragCoord;
-  let x_22 : vec4<f32> = textureLoad(texture, vec2<i32>(vec2<f32>(x_19.x, x_19.y)));
+  let x_22 : vec4<f32> = textureLoad(texture, vec2<i32>(vec2<f32>(x_19.x, x_19.y)), 0);
   color_out = x_22;
   return;
 }