Remove underscores from ValidTextureOverload enum names For consistency's sake. Change-Id: I08d0b7a5377fed0075feb7c3a0332cda43fb73bd Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/37847 Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: David Neto <dneto@google.com> Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/src/ast/intrinsic_texture_helper_test.cc b/src/ast/intrinsic_texture_helper_test.cc index 280236d..fbeae35 100644 --- a/src/ast/intrinsic_texture_helper_test.cc +++ b/src/ast/intrinsic_texture_helper_test.cc
@@ -329,7 +329,7 @@ [](Builder* b) { return b->ExprList("texture", 1); }, }, { - ValidTextureOverload::kDimensionsMultisampled_2d, + ValidTextureOverload::kDimensionsMultisampled2d, "textureDimensions(t : texture_multisampled_2d<f32>)-> vec2<i32>", TextureKind::kMultisampled, type::SamplerKind::kSampler, @@ -339,7 +339,7 @@ [](Builder* b) { return b->ExprList("texture"); }, }, { - ValidTextureOverload::kDimensionsMultisampled_2dArray, + ValidTextureOverload::kDimensionsMultisampled2dArray, "textureDimensions(t : texture_multisampled_2d_array<f32>)-> " "vec2<i32>", TextureKind::kMultisampled, @@ -572,7 +572,7 @@ [](Builder* b) { return b->ExprList("texture"); }, }, { - ValidTextureOverload::kNumLayersMultisampled_2dArray, + ValidTextureOverload::kNumLayersMultisampled2dArray, "textureNumLayers(t : texture_multisampled_2d_array<f32>) -> i32", TextureKind::kMultisampled, type::SamplerKind::kSampler,
diff --git a/src/ast/intrinsic_texture_helper_test.h b/src/ast/intrinsic_texture_helper_test.h index c30f1be..e78f9e0 100644 --- a/src/ast/intrinsic_texture_helper_test.h +++ b/src/ast/intrinsic_texture_helper_test.h
@@ -49,8 +49,8 @@ kDimensionsCubeLevel, kDimensionsCubeArray, kDimensionsCubeArrayLevel, - kDimensionsMultisampled_2d, - kDimensionsMultisampled_2dArray, + kDimensionsMultisampled2d, + kDimensionsMultisampled2dArray, kDimensionsDepth2d, kDimensionsDepth2dLevel, kDimensionsDepth2dArray, @@ -72,7 +72,7 @@ kNumLayers1dArray, kNumLayers2dArray, kNumLayersCubeArray, - kNumLayersMultisampled_2dArray, + kNumLayersMultisampled2dArray, kNumLayersDepth2dArray, kNumLayersDepthCubeArray, kNumLayersStorageWO1dArray,
diff --git a/src/type_determiner_test.cc b/src/type_determiner_test.cc index 542d0be..1a76ae4 100644 --- a/src/type_determiner_test.cc +++ b/src/type_determiner_test.cc
@@ -2913,8 +2913,8 @@ case ValidTextureOverload::kDimensions3d: case ValidTextureOverload::kDimensionsCube: case ValidTextureOverload::kDimensionsCubeArray: - case ValidTextureOverload::kDimensionsMultisampled_2d: - case ValidTextureOverload::kDimensionsMultisampled_2dArray: + case ValidTextureOverload::kDimensionsMultisampled2d: + case ValidTextureOverload::kDimensionsMultisampled2dArray: case ValidTextureOverload::kDimensionsDepth2d: case ValidTextureOverload::kDimensionsDepth2dArray: case ValidTextureOverload::kDimensionsDepthCube: @@ -2933,7 +2933,7 @@ case ValidTextureOverload::kNumLayers1dArray: case ValidTextureOverload::kNumLayers2dArray: case ValidTextureOverload::kNumLayersCubeArray: - case ValidTextureOverload::kNumLayersMultisampled_2dArray: + case ValidTextureOverload::kNumLayersMultisampled2dArray: case ValidTextureOverload::kNumLayersDepth2dArray: case ValidTextureOverload::kNumLayersDepthCubeArray: case ValidTextureOverload::kNumLayersStorageWO1dArray:
diff --git a/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc b/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc index 4a15b4c..bbc5401 100644 --- a/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc +++ b/src/writer/hlsl/generator_impl_intrinsic_texture_test.cc
@@ -57,7 +57,7 @@ "_tint_tmp.x", }; case ValidTextureOverload::kDimensions2d: - case ValidTextureOverload::kDimensionsMultisampled_2d: + case ValidTextureOverload::kDimensionsMultisampled2d: case ValidTextureOverload::kDimensionsDepth2d: case ValidTextureOverload::kDimensionsStorageRO2d: case ValidTextureOverload::kDimensionsStorageWO2d: @@ -67,7 +67,7 @@ "_tint_tmp", }; case ValidTextureOverload::kDimensions2dArray: - case ValidTextureOverload::kDimensionsMultisampled_2dArray: + case ValidTextureOverload::kDimensionsMultisampled2dArray: case ValidTextureOverload::kDimensionsDepth2dArray: case ValidTextureOverload::kDimensionsStorageRO2dArray: case ValidTextureOverload::kDimensionsStorageWO2dArray: @@ -146,7 +146,7 @@ "_tint_tmp.y", }; case ValidTextureOverload::kNumLayers2dArray: - case ValidTextureOverload::kNumLayersMultisampled_2dArray: + case ValidTextureOverload::kNumLayersMultisampled2dArray: case ValidTextureOverload::kNumLayersDepth2dArray: case ValidTextureOverload::kNumLayersCubeArray: case ValidTextureOverload::kNumLayersDepthCubeArray:
diff --git a/src/writer/msl/generator_impl_intrinsic_texture_test.cc b/src/writer/msl/generator_impl_intrinsic_texture_test.cc index 962a18b..ded1bfb 100644 --- a/src/writer/msl/generator_impl_intrinsic_texture_test.cc +++ b/src/writer/msl/generator_impl_intrinsic_texture_test.cc
@@ -41,8 +41,8 @@ return R"(int(texture_tint_0.get_width()))"; case ValidTextureOverload::kDimensions2d: case ValidTextureOverload::kDimensions2dArray: - case ValidTextureOverload::kDimensionsMultisampled_2d: - case ValidTextureOverload::kDimensionsMultisampled_2dArray: + case ValidTextureOverload::kDimensionsMultisampled2d: + case ValidTextureOverload::kDimensionsMultisampled2dArray: case ValidTextureOverload::kDimensionsDepth2d: case ValidTextureOverload::kDimensionsDepth2dArray: case ValidTextureOverload::kDimensionsStorageRO2d: @@ -74,7 +74,7 @@ case ValidTextureOverload::kNumLayers1dArray: case ValidTextureOverload::kNumLayers2dArray: case ValidTextureOverload::kNumLayersCubeArray: - case ValidTextureOverload::kNumLayersMultisampled_2dArray: + case ValidTextureOverload::kNumLayersMultisampled2dArray: case ValidTextureOverload::kNumLayersDepth2dArray: case ValidTextureOverload::kNumLayersDepthCubeArray: case ValidTextureOverload::kNumLayersStorageWO1dArray:
diff --git a/src/writer/spirv/builder_intrinsic_texture_test.cc b/src/writer/spirv/builder_intrinsic_texture_test.cc index 9267280..bf4c87f 100644 --- a/src/writer/spirv/builder_intrinsic_texture_test.cc +++ b/src/writer/spirv/builder_intrinsic_texture_test.cc
@@ -310,7 +310,7 @@ OpCapability SampledCubeArray OpCapability ImageQuery )"}; - case ValidTextureOverload::kDimensionsMultisampled_2d: + case ValidTextureOverload::kDimensionsMultisampled2d: return { R"( %4 = OpTypeFloat 32 @@ -330,7 +330,7 @@ R"( OpCapability ImageQuery )"}; - case ValidTextureOverload::kDimensionsMultisampled_2dArray: + case ValidTextureOverload::kDimensionsMultisampled2dArray: return { R"( %4 = OpTypeFloat 32 @@ -806,7 +806,7 @@ OpCapability SampledCubeArray OpCapability ImageQuery )"}; - case ValidTextureOverload::kNumLayersMultisampled_2dArray: + case ValidTextureOverload::kNumLayersMultisampled2dArray: return {R"( %4 = OpTypeFloat 32 %3 = OpTypeImage %4 2D 0 1 1 1 Unknown