tint: Remove textureNumLayers() overloads for texture cube arrays

These are not supported in HLSL shader model 5.1

See: https://github.com/gpuweb/gpuweb/issues/3913
Change-Id: Ic33666ff910f04e3f561cbc40c9db14c5de59284
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/122524
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/tint/ast/builtin_texture_helper_test.cc

@@ -851,17 +851,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
             [](ProgramBuilder* b) { return b->ExprList(kTextureName); },
             /* returns value */ true,
         },
-        {
-            ValidTextureOverload::kNumLayersCubeArray,
-            "textureNumLayers(t : texture_cube_array<f32>) -> u32",
-            TextureKind::kRegular,
-            type::SamplerKind::kSampler,
-            type::TextureDimension::kCubeArray,
-            TextureDataType::kF32,
-            "textureNumLayers",
-            [](ProgramBuilder* b) { return b->ExprList(kTextureName); },
-            /* returns value */ true,
-        },
         {
             ValidTextureOverload::kNumLayersDepth2dArray,
             "textureNumLayers(t : texture_depth_2d_array) -> u32",
@@ -873,17 +862,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
             [](ProgramBuilder* b) { return b->ExprList(kTextureName); },
             /* returns value */ true,
         },
-        {
-            ValidTextureOverload::kNumLayersDepthCubeArray,
-            "textureNumLayers(t : texture_depth_cube_array) -> u32",
-            TextureKind::kDepth,
-            type::SamplerKind::kSampler,
-            type::TextureDimension::kCubeArray,
-            TextureDataType::kF32,
-            "textureNumLayers",
-            [](ProgramBuilder* b) { return b->ExprList(kTextureName); },
-            /* returns value */ true,
-        },
         {
             ValidTextureOverload::kNumLayersStorageWO2dArray,
             "textureNumLayers(t : texture_storage_2d_array<rgba32float>) -> u32",

src/tint/ast/builtin_texture_helper_test.h

@@ -83,9 +83,7 @@ enum class ValidTextureOverload {
     kGatherCompareDepthCubeF32,
     kGatherCompareDepthCubeArrayF32,
     kNumLayers2dArray,
-    kNumLayersCubeArray,
     kNumLayersDepth2dArray,
-    kNumLayersDepthCubeArray,
     kNumLayersStorageWO2dArray,
     kNumLevels2d,
     kNumLevels2dArray,

src/tint/intrinsics.def

@@ -739,9 +739,7 @@ match workgroup
 @must_use fn textureGatherCompare(texture: texture_depth_cube, sampler: sampler_comparison, coords: vec3<f32>, depth_ref: f32) -> vec4<f32>
 @must_use fn textureGatherCompare<A: iu32>(texture: texture_depth_cube_array, sampler: sampler_comparison, coords: vec3<f32>, array_index: A, depth_ref: f32) -> vec4<f32>
 @must_use fn textureNumLayers<T: fiu32>(texture: texture_2d_array<T>) -> u32
-@must_use fn textureNumLayers<T: fiu32>(texture: texture_cube_array<T>) -> u32
 @must_use fn textureNumLayers(texture: texture_depth_2d_array) -> u32
-@must_use fn textureNumLayers(texture: texture_depth_cube_array) -> u32
 @must_use fn textureNumLayers<F: texel_format, A: write>(texture: texture_storage_2d_array<F, A>) -> u32
 @must_use fn textureNumLevels<T: fiu32>(texture: texture_1d<T>) -> u32
 @must_use fn textureNumLevels<T: fiu32>(texture: texture_2d<T>) -> u32

src/tint/resolver/builtin_test.cc

@@ -2263,9 +2263,7 @@ static const char* expected_texture_overload(ast::builtin::test::ValidTextureOve
         case ValidTextureOverload::kGatherCompareDepthCubeArrayF32:
             return R"(textureGatherCompare(texture, sampler, coords, array_index, depth_ref))";
         case ValidTextureOverload::kNumLayers2dArray:
-        case ValidTextureOverload::kNumLayersCubeArray:
         case ValidTextureOverload::kNumLayersDepth2dArray:
-        case ValidTextureOverload::kNumLayersDepthCubeArray:
         case ValidTextureOverload::kNumLayersStorageWO2dArray:
             return R"(textureNumLayers(texture))";
         case ValidTextureOverload::kNumLevels2d:

src/tint/writer/glsl/generator_impl_builtin_texture_test.cc

@@ -98,8 +98,6 @@ ExpectedResult expected_texture_overload(ast::builtin::test::ValidTextureOverloa
             return R"(textureGather(Texture_Sampler, vec4(1.0f, 2.0f, 3.0f, float(4u)), 5.0f))";
         case ValidTextureOverload::kNumLayers2dArray:
         case ValidTextureOverload::kNumLayersDepth2dArray:
-        case ValidTextureOverload::kNumLayersCubeArray:
-        case ValidTextureOverload::kNumLayersDepthCubeArray:
             return {"textureSize"};
         case ValidTextureOverload::kNumLayersStorageWO2dArray:
             return {"imageSize"};

src/tint/writer/hlsl/generator_impl_builtin_texture_test.cc

@@ -170,8 +170,6 @@ ExpectedResult expected_texture_overload(ast::builtin::test::ValidTextureOverloa
             return R"(tint_symbol.GatherCmp(tint_symbol_1, float4(1.0f, 2.0f, 3.0f, float(4u)), 5.0f))";
         case ValidTextureOverload::kNumLayers2dArray:
         case ValidTextureOverload::kNumLayersDepth2dArray:
-        case ValidTextureOverload::kNumLayersCubeArray:
-        case ValidTextureOverload::kNumLayersDepthCubeArray:
         case ValidTextureOverload::kNumLayersStorageWO2dArray:
             return {
                 R"(int3 tint_tmp;

src/tint/writer/msl/generator_impl_builtin_texture_test.cc

@@ -90,9 +90,7 @@ std::string expected_texture_overload(ast::builtin::test::ValidTextureOverload o
         case ValidTextureOverload::kGatherCompareDepthCubeArrayF32:
             return R"(Texture.gather_compare(Sampler, float3(1.0f, 2.0f, 3.0f), 4u, 5.0f))";
         case ValidTextureOverload::kNumLayers2dArray:
-        case ValidTextureOverload::kNumLayersCubeArray:
         case ValidTextureOverload::kNumLayersDepth2dArray:
-        case ValidTextureOverload::kNumLayersDepthCubeArray:
         case ValidTextureOverload::kNumLayersStorageWO2dArray:
             return R"(Texture.get_array_size())";
         case ValidTextureOverload::kNumLevels2d:

src/tint/writer/spirv/builder_builtin_texture_test.cc

@@ -1131,29 +1131,6 @@ OpCapability SampledCubeArray
 )",
                     R"(
 OpCapability ImageQuery
-)"};
-        case ValidTextureOverload::kNumLayersCubeArray:
-            return {R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 Cube 0 1 0 1 Unknown
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeInt 32 0
-%11 = OpTypeVector %9 3
-%13 = OpTypeInt 32 1
-%14 = OpConstant %13 0
-)",
-                    R"(
-%12 = OpLoad %3 %1
-%10 = OpImageQuerySizeLod %11 %12 %14
-%8 = OpCompositeExtract %9 %10 2
-)",
-                    R"(
-OpCapability SampledCubeArray
-OpCapability ImageQuery
 )"};
         case ValidTextureOverload::kNumLayersDepth2dArray:
             return {R"(
@@ -1176,29 +1153,6 @@ OpCapability ImageQuery
 )",
                     R"(
 OpCapability ImageQuery
-)"};
-        case ValidTextureOverload::kNumLayersDepthCubeArray:
-            return {R"(
-%4 = OpTypeFloat 32
-%3 = OpTypeImage %4 Cube 0 1 0 1 Unknown
-%2 = OpTypePointer UniformConstant %3
-%1 = OpVariable %2 UniformConstant
-%7 = OpTypeSampler
-%6 = OpTypePointer UniformConstant %7
-%5 = OpVariable %6 UniformConstant
-%9 = OpTypeInt 32 0
-%11 = OpTypeVector %9 3
-%13 = OpTypeInt 32 1
-%14 = OpConstant %13 0
-)",
-                    R"(
-%12 = OpLoad %3 %1
-%10 = OpImageQuerySizeLod %11 %12 %14
-%8 = OpCompositeExtract %9 %10 2
-)",
-                    R"(
-OpCapability SampledCubeArray
-OpCapability ImageQuery
 )"};
         case ValidTextureOverload::kNumLayersStorageWO2dArray:
             return {R"(