encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-15 17:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove underscores from ValidTextureOverload enum names

Browse Source 
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>
This commit is contained in:
Ben Clayton 2021-01-14 18:09:07 +00:00 committed by Commit Bot service account
parent d97132028a
commit 6e5b5ecc52
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ast/intrinsic_texture_helper_test.cc
View File

@ -329,7 +329,7 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
[](Builder* b) { return b->ExprList("texture", 1); }, [](Builder* b) { return b->ExprList("texture", 1); },
}, },
{ {
ValidTextureOverload::kDimensionsMultisampled_2d, ValidTextureOverload::kDimensionsMultisampled2d,
"textureDimensions(t : texture_multisampled_2d<f32>)-> vec2<i32>", "textureDimensions(t : texture_multisampled_2d<f32>)-> vec2<i32>",
TextureKind::kMultisampled, TextureKind::kMultisampled,
type::SamplerKind::kSampler, type::SamplerKind::kSampler,
@ -339,7 +339,7 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
[](Builder* b) { return b->ExprList("texture"); }, [](Builder* b) { return b->ExprList("texture"); },
}, },
{ {
ValidTextureOverload::kDimensionsMultisampled_2dArray, ValidTextureOverload::kDimensionsMultisampled2dArray,
"textureDimensions(t : texture_multisampled_2d_array<f32>)-> " "textureDimensions(t : texture_multisampled_2d_array<f32>)-> "
"vec2<i32>", "vec2<i32>",
TextureKind::kMultisampled, TextureKind::kMultisampled,
@ -572,7 +572,7 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
[](Builder* b) { return b->ExprList("texture"); }, [](Builder* b) { return b->ExprList("texture"); },
}, },
{ {
ValidTextureOverload::kNumLayersMultisampled_2dArray, ValidTextureOverload::kNumLayersMultisampled2dArray,
"textureNumLayers(t : texture_multisampled_2d_array<f32>) -> i32", "textureNumLayers(t : texture_multisampled_2d_array<f32>) -> i32",
TextureKind::kMultisampled, TextureKind::kMultisampled,
type::SamplerKind::kSampler, type::SamplerKind::kSampler,

6
src/ast/intrinsic_texture_helper_test.h
View File

@ -49,8 +49,8 @@ enum class ValidTextureOverload {
kDimensionsCubeLevel, kDimensionsCubeLevel,
kDimensionsCubeArray, kDimensionsCubeArray,
kDimensionsCubeArrayLevel, kDimensionsCubeArrayLevel,
kDimensionsMultisampled_2d, kDimensionsMultisampled2d,
kDimensionsMultisampled_2dArray, kDimensionsMultisampled2dArray,
kDimensionsDepth2d, kDimensionsDepth2d,
kDimensionsDepth2dLevel, kDimensionsDepth2dLevel,
kDimensionsDepth2dArray, kDimensionsDepth2dArray,
@ -72,7 +72,7 @@ enum class ValidTextureOverload {
kNumLayers1dArray, kNumLayers1dArray,
kNumLayers2dArray, kNumLayers2dArray,
kNumLayersCubeArray, kNumLayersCubeArray,
kNumLayersMultisampled_2dArray, kNumLayersMultisampled2dArray,
kNumLayersDepth2dArray, kNumLayersDepth2dArray,
kNumLayersDepthCubeArray, kNumLayersDepthCubeArray,
kNumLayersStorageWO1dArray, kNumLayersStorageWO1dArray,

6
src/type_determiner_test.cc
View File

@ -2913,8 +2913,8 @@ const char* expected_texture_overload(
case ValidTextureOverload::kDimensions3d: case ValidTextureOverload::kDimensions3d:
case ValidTextureOverload::kDimensionsCube: case ValidTextureOverload::kDimensionsCube:
case ValidTextureOverload::kDimensionsCubeArray: case ValidTextureOverload::kDimensionsCubeArray:
case ValidTextureOverload::kDimensionsMultisampled_2d: case ValidTextureOverload::kDimensionsMultisampled2d:
case ValidTextureOverload::kDimensionsMultisampled_2dArray: case ValidTextureOverload::kDimensionsMultisampled2dArray:
case ValidTextureOverload::kDimensionsDepth2d: case ValidTextureOverload::kDimensionsDepth2d:
case ValidTextureOverload::kDimensionsDepth2dArray: case ValidTextureOverload::kDimensionsDepth2dArray:
case ValidTextureOverload::kDimensionsDepthCube: case ValidTextureOverload::kDimensionsDepthCube:
@ -2933,7 +2933,7 @@ const char* expected_texture_overload(
case ValidTextureOverload::kNumLayers1dArray: case ValidTextureOverload::kNumLayers1dArray:
case ValidTextureOverload::kNumLayers2dArray: case ValidTextureOverload::kNumLayers2dArray:
case ValidTextureOverload::kNumLayersCubeArray: case ValidTextureOverload::kNumLayersCubeArray:
case ValidTextureOverload::kNumLayersMultisampled_2dArray: case ValidTextureOverload::kNumLayersMultisampled2dArray:
case ValidTextureOverload::kNumLayersDepth2dArray: case ValidTextureOverload::kNumLayersDepth2dArray:
case ValidTextureOverload::kNumLayersDepthCubeArray: case ValidTextureOverload::kNumLayersDepthCubeArray:
case ValidTextureOverload::kNumLayersStorageWO1dArray: case ValidTextureOverload::kNumLayersStorageWO1dArray:

6
src/writer/hlsl/generator_impl_intrinsic_texture_test.cc
View File

@ -57,7 +57,7 @@ ExpectedResult expected_texture_overload(
"_tint_tmp.x", "_tint_tmp.x",
}; };
case ValidTextureOverload::kDimensions2d: case ValidTextureOverload::kDimensions2d:
case ValidTextureOverload::kDimensionsMultisampled_2d: case ValidTextureOverload::kDimensionsMultisampled2d:
case ValidTextureOverload::kDimensionsDepth2d: case ValidTextureOverload::kDimensionsDepth2d:
case ValidTextureOverload::kDimensionsStorageRO2d: case ValidTextureOverload::kDimensionsStorageRO2d:
case ValidTextureOverload::kDimensionsStorageWO2d: case ValidTextureOverload::kDimensionsStorageWO2d:
@ -67,7 +67,7 @@ ExpectedResult expected_texture_overload(
"_tint_tmp", "_tint_tmp",
}; };
case ValidTextureOverload::kDimensions2dArray: case ValidTextureOverload::kDimensions2dArray:
case ValidTextureOverload::kDimensionsMultisampled_2dArray: case ValidTextureOverload::kDimensionsMultisampled2dArray:
case ValidTextureOverload::kDimensionsDepth2dArray: case ValidTextureOverload::kDimensionsDepth2dArray:
case ValidTextureOverload::kDimensionsStorageRO2dArray: case ValidTextureOverload::kDimensionsStorageRO2dArray:
case ValidTextureOverload::kDimensionsStorageWO2dArray: case ValidTextureOverload::kDimensionsStorageWO2dArray:
@ -146,7 +146,7 @@ ExpectedResult expected_texture_overload(
"_tint_tmp.y", "_tint_tmp.y",
}; };
case ValidTextureOverload::kNumLayers2dArray: case ValidTextureOverload::kNumLayers2dArray:
case ValidTextureOverload::kNumLayersMultisampled_2dArray: case ValidTextureOverload::kNumLayersMultisampled2dArray:
case ValidTextureOverload::kNumLayersDepth2dArray: case ValidTextureOverload::kNumLayersDepth2dArray:
case ValidTextureOverload::kNumLayersCubeArray: case ValidTextureOverload::kNumLayersCubeArray:
case ValidTextureOverload::kNumLayersDepthCubeArray: case ValidTextureOverload::kNumLayersDepthCubeArray:

6
src/writer/msl/generator_impl_intrinsic_texture_test.cc
View File

@ -41,8 +41,8 @@ std::string expected_texture_overload(
return R"(int(texture_tint_0.get_width()))"; return R"(int(texture_tint_0.get_width()))";
case ValidTextureOverload::kDimensions2d: case ValidTextureOverload::kDimensions2d:
case ValidTextureOverload::kDimensions2dArray: case ValidTextureOverload::kDimensions2dArray:
case ValidTextureOverload::kDimensionsMultisampled_2d: case ValidTextureOverload::kDimensionsMultisampled2d:
case ValidTextureOverload::kDimensionsMultisampled_2dArray: case ValidTextureOverload::kDimensionsMultisampled2dArray:
case ValidTextureOverload::kDimensionsDepth2d: case ValidTextureOverload::kDimensionsDepth2d:
case ValidTextureOverload::kDimensionsDepth2dArray: case ValidTextureOverload::kDimensionsDepth2dArray:
case ValidTextureOverload::kDimensionsStorageRO2d: case ValidTextureOverload::kDimensionsStorageRO2d:
@ -74,7 +74,7 @@ std::string expected_texture_overload(
case ValidTextureOverload::kNumLayers1dArray: case ValidTextureOverload::kNumLayers1dArray:
case ValidTextureOverload::kNumLayers2dArray: case ValidTextureOverload::kNumLayers2dArray:
case ValidTextureOverload::kNumLayersCubeArray: case ValidTextureOverload::kNumLayersCubeArray:
case ValidTextureOverload::kNumLayersMultisampled_2dArray: case ValidTextureOverload::kNumLayersMultisampled2dArray:
case ValidTextureOverload::kNumLayersDepth2dArray: case ValidTextureOverload::kNumLayersDepth2dArray:
case ValidTextureOverload::kNumLayersDepthCubeArray: case ValidTextureOverload::kNumLayersDepthCubeArray:
case ValidTextureOverload::kNumLayersStorageWO1dArray: case ValidTextureOverload::kNumLayersStorageWO1dArray:

6
src/writer/spirv/builder_intrinsic_texture_test.cc
View File

@ -310,7 +310,7 @@ OpCapability ImageQuery
OpCapability SampledCubeArray OpCapability SampledCubeArray
OpCapability ImageQuery OpCapability ImageQuery
)"}; )"};
case ValidTextureOverload::kDimensionsMultisampled_2d: case ValidTextureOverload::kDimensionsMultisampled2d:
return { return {
R"( R"(
%4 = OpTypeFloat 32 %4 = OpTypeFloat 32
@ -330,7 +330,7 @@ OpCapability ImageQuery
R"( R"(
OpCapability ImageQuery OpCapability ImageQuery
)"}; )"};
case ValidTextureOverload::kDimensionsMultisampled_2dArray: case ValidTextureOverload::kDimensionsMultisampled2dArray:
return { return {
R"( R"(
%4 = OpTypeFloat 32 %4 = OpTypeFloat 32
@ -806,7 +806,7 @@ OpCapability ImageQuery
OpCapability SampledCubeArray OpCapability SampledCubeArray
OpCapability ImageQuery OpCapability ImageQuery
)"}; )"};
case ValidTextureOverload::kNumLayersMultisampled_2dArray: case ValidTextureOverload::kNumLayersMultisampled2dArray:
return {R"( return {R"(
%4 = OpTypeFloat 32 %4 = OpTypeFloat 32
%3 = OpTypeImage %4 2D 0 1 1 1 Unknown %3 = OpTypeImage %4 2D 0 1 1 1 Unknown