encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes deprecation period code for multisampled float sample type. 

- Note that by default these are already errors, not warnings.

Change-Id: I4eadbb6f71b2d2a39efe5755dbb6b8c329f1674f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/128063
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Loko Kung <lokokung@google.com>
Reviewed-by: Shrek Shao <shrekshao@google.com>
This commit is contained in:
Loko Kung 2023-04-21 05:57:20 +00:00 committed by Dawn LUCI CQ
parent f9719b7588
commit 003e879fd9
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dawn/native/BindGroupLayout.cpp
View File

@ -114,11 +114,9 @@ MaybeError ValidateBindGroupLayoutEntry(DeviceBase* device,
"View dimension (%s) for a multisampled texture bindings was not %s.", "View dimension (%s) for a multisampled texture bindings was not %s.",
viewDimension, wgpu::TextureViewDimension::e2D); viewDimension, wgpu::TextureViewDimension::e2D);
if (texture.multisampled && texture.sampleType == wgpu::TextureSampleType::Float) { DAWN_INVALID_IF(
DAWN_TRY(DAWN_MAKE_DEPRECATION_ERROR( texture.multisampled && texture.sampleType == wgpu::TextureSampleType::Float,
device, "Sample type %s for multisampled texture bindings was %s.", "Sample type for multisampled texture binding was %s.", wgpu::TextureSampleType::Float);
texture.sampleType, wgpu::TextureSampleType::Float));
}
} }
if (entry.storageTexture.access != wgpu::StorageTextureAccess::Undefined) { if (entry.storageTexture.access != wgpu::StorageTextureAccess::Undefined) {

2
src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp
View File

@ -1650,7 +1650,7 @@ TEST_F(BindGroupLayoutValidationTest, MultisampledTextureViewDimension) {
// Test that multisampled texture bindings are valid // Test that multisampled texture bindings are valid
TEST_F(BindGroupLayoutValidationTest, MultisampledTextureSampleType) { TEST_F(BindGroupLayoutValidationTest, MultisampledTextureSampleType) {
// Multisampled float sample type deprecated. // Multisampled float sample type is not supported.
ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout( ASSERT_DEVICE_ERROR(utils::MakeBindGroupLayout(
device, { device, {
{0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float, {0, wgpu::ShaderStage::Compute, wgpu::TextureSampleType::Float,

9
src/dawn/tests/unittests/validation/DeprecatedAPITests.cpp
View File

@ -136,15 +136,6 @@ TEST_P(DeprecationTests, MaxBufferSizeValidation) {
EXPECT_DEPRECATION_ERROR_OR_WARNING(device.CreateBuffer(&descriptor)); 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, INSTANTIATE_TEST_SUITE_P(DeprecatedAPITest,
DeprecationTests, DeprecationTests,
testing::Values(true, false), testing::Values(true, false),