Skip several dawn_end2end_tests on specific platforms

Bug: dawn:1423, dawn:1429
Test: dawn_end2end_tests
Change-Id: Idc9d573f02f7ef70d1901a786e73d362d60697bf
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/91064
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Jiawei Shao 2022-05-23 01:07:53 +00:00 committed by Dawn LUCI CQ
parent 8d9adb0219
commit 318f6acd56
5 changed files with 21 additions and 3 deletions

View File

@ -831,6 +831,10 @@ bool DawnTestBase::IsBackendValidationEnabled() const {
return gTestEnv->GetBackendValidationLevel() != dawn::native::BackendValidationLevel::Disabled;
}
bool DawnTestBase::IsFullBackendValidationEnabled() const {
return gTestEnv->GetBackendValidationLevel() == dawn::native::BackendValidationLevel::Full;
}
bool DawnTestBase::RunSuppressedTests() const {
return gTestEnv->RunSuppressedTests();
}

View File

@ -309,6 +309,7 @@ class DawnTestBase {
bool UsesWire() const;
bool IsBackendValidationEnabled() const;
bool IsFullBackendValidationEnabled() const;
bool RunSuppressedTests() const;
bool IsDXC() const;

View File

@ -219,7 +219,7 @@ TEST_P(ComputeDispatchTests, IndirectBasic) {
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
#endif
// TODO(crbug.com/dawn/1262): Fails with the full validation turned on.
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsBackendValidationEnabled());
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled());
IndirectTest({2, 3, 4}, 0);
}
@ -251,7 +251,7 @@ TEST_P(ComputeDispatchTests, IndirectOffset) {
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
#endif
// TODO(crbug.com/dawn/1262): Fails with the full validation turned on.
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsBackendValidationEnabled());
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled());
IndirectTest({0, 0, 0, 2, 3, 4}, 3 * sizeof(uint32_t));
}
@ -268,7 +268,7 @@ TEST_P(ComputeDispatchTests, MaxWorkgroups) {
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
#endif
// TODO(crbug.com/dawn/1262): Fails with the full validation turned on.
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsBackendValidationEnabled());
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled());
// TODO(crbug.com/dawn/1165): Fails with WARP
DAWN_SUPPRESS_TEST_IF(IsWARP());

View File

@ -280,6 +280,8 @@ TEST_P(FirstIndexOffsetTests, IndexedBothOffset) {
// Test that vertex_index starts at 7 when drawn using DrawIndirect()
TEST_P(FirstIndexOffsetTests, NonIndexedIndirectVertexOffset) {
// TODO(crbug.com/dawn/1429): Fails with the full validation turned on.
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled());
TestVertexIndex(DrawMode::NonIndexedIndirect, 7);
}
@ -296,6 +298,8 @@ TEST_P(FirstIndexOffsetTests, NonIndexedIndirectBothOffset) {
// Test that vertex_index starts at 7 when drawn using DrawIndexedIndirect()
TEST_P(FirstIndexOffsetTests, IndexedIndirectVertex) {
// TODO(crbug.com/dawn/1429): Fails with the full validation turned on.
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsFullBackendValidationEnabled());
TestVertexIndex(DrawMode::IndexedIndirect, 7);
}

View File

@ -469,6 +469,9 @@ TEST_P(TextureZeroInitTest, CopyTextureToTextureHalf) {
// This tests the texture with depth attachment and load op load will init depth stencil texture to
// 0s.
TEST_P(TextureZeroInitTest, RenderingLoadingDepth) {
// TODO(crbug.com/dawn/1423): Investigate why this test fails on Windows Vulkan drivers
DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan());
wgpu::TextureDescriptor srcDescriptor =
CreateTextureDescriptor(1, 1,
wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::CopyDst |
@ -511,6 +514,9 @@ TEST_P(TextureZeroInitTest, RenderingLoadingDepth) {
// This tests the texture with stencil attachment and load op load will init depth stencil texture
// to 0s.
TEST_P(TextureZeroInitTest, RenderingLoadingStencil) {
// TODO(crbug.com/dawn/1423): Investigate why this test fails on Windows Vulkan drivers
DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan());
wgpu::TextureDescriptor srcDescriptor =
CreateTextureDescriptor(1, 1,
wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::CopyDst |
@ -553,6 +559,9 @@ TEST_P(TextureZeroInitTest, RenderingLoadingStencil) {
// This tests the texture with depth stencil attachment and load op load will init depth stencil
// texture to 0s.
TEST_P(TextureZeroInitTest, RenderingLoadingDepthStencil) {
// TODO(crbug.com/dawn/1423): Investigate why this test fails on Windows Vulkan drivers
DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan());
wgpu::TextureDescriptor srcDescriptor =
CreateTextureDescriptor(1, 1,
wgpu::TextureUsage::CopySrc | wgpu::TextureUsage::CopyDst |