diff --git a/src/dawn/native/BindGroupLayout.cpp b/src/dawn/native/BindGroupLayout.cpp index fcedc2c583..1579bd3678 100644 --- a/src/dawn/native/BindGroupLayout.cpp +++ b/src/dawn/native/BindGroupLayout.cpp @@ -114,11 +114,9 @@ MaybeError ValidateBindGroupLayoutEntry(DeviceBase* device, "View dimension (%s) for a multisampled texture bindings was not %s.", viewDimension, wgpu::TextureViewDimension::e2D); - if (texture.multisampled && texture.sampleType == wgpu::TextureSampleType::Float) { - DAWN_TRY(DAWN_MAKE_DEPRECATION_ERROR( - device, "Sample type %s for multisampled texture bindings was %s.", - texture.sampleType, wgpu::TextureSampleType::Float)); - } + DAWN_INVALID_IF( + texture.multisampled && texture.sampleType == wgpu::TextureSampleType::Float, + "Sample type for multisampled texture binding was %s.", wgpu::TextureSampleType::Float); } if (entry.storageTexture.access != wgpu::StorageTextureAccess::Undefined) { diff --git a/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp b/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp index e4b6466ceb..813da22eb6 100644 --- a/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp +++ b/src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp @@ -1650,7 +1650,7 @@ TEST_F(BindGroupLayoutValidationTest, MultisampledTextureViewDimension) { // Test that multisampled texture bindings are valid TEST_F(BindGroupLayoutValidationTest, MultisampledTextureSampleType) { - // Multisampled float sample type deprecated. + // Multisampled float sample type is not supported. ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout( device, { {0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float, diff --git a/src/dawn/tests/unittests/validation/DeprecatedAPITests.cpp b/src/dawn/tests/unittests/validation/DeprecatedAPITests.cpp index e525662e12..029144d998 100644 --- a/src/dawn/tests/unittests/validation/DeprecatedAPITests.cpp +++ b/src/dawn/tests/unittests/validation/DeprecatedAPITests.cpp @@ -136,15 +136,6 @@ TEST_P(DeprecationTests, MaxBufferSizeValidation) { EXPECT_DEPRECATION_ERROR_OR_WARNING(device.CreateBuffer(&descriptor)); } -// Test that multisampled texture with sampleType == float should be deprecated. -TEST_P(DeprecationTests, MultisampledTextureSampleType) { - EXPECT_DEPRECATION_ERROR_OR_WARNING(utils::MakeBindGroupLayout( - device, { - {0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float, - wgpu::TextureViewDimension::e2D, true}, - })); -} - INSTANTIATE_TEST_SUITE_P(DeprecatedAPITest, DeprecationTests, testing::Values(true, false),