diff --git a/src/tests/unittests/validation/BindGroupValidationTests.cpp b/src/tests/unittests/validation/BindGroupValidationTests.cpp index 0a0f2201c4..69d890f7b7 100644 --- a/src/tests/unittests/validation/BindGroupValidationTests.cpp +++ b/src/tests/unittests/validation/BindGroupValidationTests.cpp @@ -1978,12 +1978,12 @@ TEST_F(BindGroupLayoutCompatibilityTest, TextureViewDimension) { constexpr char kTexture2DShaderFS[] = R"( [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"; constexpr char kTexture2DShaderCS[] = R"( [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(compute)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"; // Render: Test that 2D texture with 2D view dimension works @@ -2017,12 +2017,12 @@ TEST_F(BindGroupLayoutCompatibilityTest, TextureViewDimension) { constexpr char kTexture2DArrayShaderFS[] = R"( [[group(0), binding(0)]] var myTexture : texture_2d_array; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"; constexpr char kTexture2DArrayShaderCS[] = R"( [[group(0), binding(0)]] var myTexture : texture_2d_array; [[stage(compute)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"; // Render: Test that 2D texture array with 2D array view dimension works @@ -2071,7 +2071,7 @@ TEST_F(BindGroupLayoutCompatibilityTest, DISABLED_ExternalTextureBindGroupLayout ASSERT_DEVICE_ERROR(CreateFSRenderPipeline(R"( [[group(0), binding(0)]] var myTexture: texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })", {bgl})); } diff --git a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp index a4a2bb131e..987599ee01 100644 --- a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp +++ b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp @@ -245,7 +245,7 @@ TEST_F(GetBindGroupLayoutTests, BindingType) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -256,7 +256,7 @@ TEST_F(GetBindGroupLayoutTests, BindingType) { [[group(0), binding(0)]] var myTexture : texture_multisampled_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -323,7 +323,7 @@ TEST_F(GetBindGroupLayoutTests, ViewDimension) { [[group(0), binding(0)]] var myTexture : texture_1d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -334,7 +334,7 @@ TEST_F(GetBindGroupLayoutTests, ViewDimension) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -345,7 +345,7 @@ TEST_F(GetBindGroupLayoutTests, ViewDimension) { [[group(0), binding(0)]] var myTexture : texture_2d_array; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -356,7 +356,7 @@ TEST_F(GetBindGroupLayoutTests, ViewDimension) { [[group(0), binding(0)]] var myTexture : texture_3d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -367,7 +367,7 @@ TEST_F(GetBindGroupLayoutTests, ViewDimension) { [[group(0), binding(0)]] var myTexture : texture_cube; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -378,7 +378,7 @@ TEST_F(GetBindGroupLayoutTests, ViewDimension) { [[group(0), binding(0)]] var myTexture : texture_cube_array; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -405,7 +405,7 @@ TEST_F(GetBindGroupLayoutTests, TextureComponentType) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -416,7 +416,7 @@ TEST_F(GetBindGroupLayoutTests, TextureComponentType) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -427,7 +427,7 @@ TEST_F(GetBindGroupLayoutTests, TextureComponentType) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get()); } @@ -727,7 +727,7 @@ TEST_F(GetBindGroupLayoutTests, ConflictingBindingTextureMultisampling) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(vertex)]] fn main() -> [[builtin(position)]] vec4 { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); return vec4(); })"); @@ -735,7 +735,7 @@ TEST_F(GetBindGroupLayoutTests, ConflictingBindingTextureMultisampling) { [[group(0), binding(0)]] var myTexture : texture_multisampled_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); utils::ComboRenderPipelineDescriptor descriptor; @@ -752,7 +752,7 @@ TEST_F(GetBindGroupLayoutTests, ConflictingBindingViewDimension) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(vertex)]] fn main() -> [[builtin(position)]] vec4 { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); return vec4(); })"); @@ -760,7 +760,7 @@ TEST_F(GetBindGroupLayoutTests, ConflictingBindingViewDimension) { [[group(0), binding(0)]] var myTexture : texture_3d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); utils::ComboRenderPipelineDescriptor descriptor; @@ -777,7 +777,7 @@ TEST_F(GetBindGroupLayoutTests, ConflictingBindingTextureComponentType) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(vertex)]] fn main() -> [[builtin(position)]] vec4 { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); return vec4(); })"); @@ -785,7 +785,7 @@ TEST_F(GetBindGroupLayoutTests, ConflictingBindingTextureComponentType) { [[group(0), binding(0)]] var myTexture : texture_2d; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"); utils::ComboRenderPipelineDescriptor descriptor; diff --git a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp index 593a36599b..ab0e327dc5 100644 --- a/src/tests/unittests/validation/RenderPipelineValidationTests.cpp +++ b/src/tests/unittests/validation/RenderPipelineValidationTests.cpp @@ -387,7 +387,7 @@ TEST_F(RenderPipelineValidationTest, TextureComponentTypeCompatibility) { << kScalarTypes[i] << R"(>; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"; descriptor.cFragment.module = utils::CreateShaderModule(device, stream.str().c_str()); @@ -435,7 +435,7 @@ TEST_F(RenderPipelineValidationTest, TextureViewDimensionCompatibility) { [[group(0), binding(0)]] var myTexture : )" << kTextureKeywords[i] << R"(; [[stage(fragment)]] fn main() { - textureDimensions(myTexture); + ignore(textureDimensions(myTexture)); })"; descriptor.cFragment.module = utils::CreateShaderModule(device, stream.str().c_str()); diff --git a/src/tests/unittests/validation/StorageTextureValidationTests.cpp b/src/tests/unittests/validation/StorageTextureValidationTests.cpp index 8222f9d00b..b532492320 100644 --- a/src/tests/unittests/validation/StorageTextureValidationTests.cpp +++ b/src/tests/unittests/validation/StorageTextureValidationTests.cpp @@ -86,7 +86,7 @@ class StorageTextureValidationTests : public ValidationTest { << imageFormatQualifier << ", " << access << ">;\n" "[[stage(compute)]] fn main() {\n" - " textureDimensions(image0);\n" + " ignore(textureDimensions(image0));\n" "}\n"; return ostream.str(); @@ -231,7 +231,7 @@ TEST_F(StorageTextureValidationTests, ReadWriteStorageTexture) { ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"( [[group(0), binding(0)]] var image0 : texture_storage_2d; [[stage(vertex)]] fn main() { - textureDimensions(image0); + ignore(textureDimensions(image0)); })")); } @@ -240,7 +240,7 @@ TEST_F(StorageTextureValidationTests, ReadWriteStorageTexture) { ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"( [[group(0), binding(0)]] var image0 : texture_storage_2d; [[stage(fragment)]] fn main() { - textureDimensions(image0); + ignore(textureDimensions(image0)); })")); } @@ -249,7 +249,7 @@ TEST_F(StorageTextureValidationTests, ReadWriteStorageTexture) { ASSERT_DEVICE_ERROR(utils::CreateShaderModule(device, R"( [[group(0), binding(0)]] var image0 : texture_storage_2d; [[stage(compute)]] fn main() { - textureDimensions(image0); + ignore(textureDimensions(image0)); })")); } }