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

dawn: Suppress tests that fail on ANGLE/SwiftShader 

Fails roll of SwiftShader into Dawn. See crbug.com/dawn/1557 for
details.

Bug: dawn:1557
Change-Id: Ibe97f1c3083b1fe254dd935b4abfdfbea9e34050
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/104260
Reviewed-by: Brandon Jones <bajones@chromium.org>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Antonio Maiorano 2022-09-29 20:39:17 +00:00 committed by Dawn LUCI CQ
parent 2bcade246a
commit d909f2b9c5
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dawn/tests/DawnTest.cpp
View File

@ -700,6 +700,11 @@ bool DawnTestBase::IsANGLE() const {
return !mParam.adapterProperties.adapterName.find("ANGLE"); return !mParam.adapterProperties.adapterName.find("ANGLE");
} }
bool DawnTestBase::IsANGLESwiftShader() const {
return !mParam.adapterProperties.adapterName.find("ANGLE") &&
(mParam.adapterProperties.adapterName.find("SwiftShader") != std::string::npos);
}
bool DawnTestBase::IsWARP() const { bool DawnTestBase::IsWARP() const {
return gpu_info::IsMicrosoftWARP(mParam.adapterProperties.vendorID, return gpu_info::IsMicrosoftWARP(mParam.adapterProperties.vendorID,
mParam.adapterProperties.deviceID); mParam.adapterProperties.deviceID);

1
src/dawn/tests/DawnTest.h
View File

@ -233,6 +233,7 @@ class DawnTestBase {
bool IsQualcomm() const; bool IsQualcomm() const;
bool IsSwiftshader() const; bool IsSwiftshader() const;
bool IsANGLE() const; bool IsANGLE() const;
bool IsANGLESwiftShader() const;
bool IsWARP() const; bool IsWARP() const;
bool IsIntelGen12() const; bool IsIntelGen12() const;

6
src/dawn/tests/end2end/IndexFormatTests.cpp
View File

@ -294,6 +294,9 @@ TEST_P(TriangleStripPrimitiveRestartTests, Uint32PrimitiveRestart) {
// Same as the above test, but uses an OOB index to emulate primitive restart being disabled, // Same as the above test, but uses an OOB index to emulate primitive restart being disabled,
// causing point C to be written to. // causing point C to be written to.
TEST_P(TriangleStripPrimitiveRestartTests, Uint32WithoutPrimitiveRestart) { TEST_P(TriangleStripPrimitiveRestartTests, Uint32WithoutPrimitiveRestart) {
// TODO(crbug.com/dawn/1557): Remove suppression once ANGLE bug is fixed
DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsANGLESwiftShader());
wgpu::RenderPipeline pipeline = MakeTestPipeline(wgpu::IndexFormat::Uint32); wgpu::RenderPipeline pipeline = MakeTestPipeline(wgpu::IndexFormat::Uint32);
wgpu::Buffer indexBuffer = wgpu::Buffer indexBuffer =
utils::CreateBufferFromData<uint32_t>(device, wgpu::BufferUsage::Index, utils::CreateBufferFromData<uint32_t>(device, wgpu::BufferUsage::Index,
@ -419,6 +422,9 @@ TEST_P(LineStripPrimitiveRestartTests, Uint32PrimitiveRestart) {
// Same as the above test, but uses an OOB index to emulate primitive restart being disabled, // Same as the above test, but uses an OOB index to emulate primitive restart being disabled,
// causing point A to be written to. // causing point A to be written to.
TEST_P(LineStripPrimitiveRestartTests, Uint32WithoutPrimitiveRestart) { TEST_P(LineStripPrimitiveRestartTests, Uint32WithoutPrimitiveRestart) {
// TODO(crbug.com/dawn/1557): Remove suppression once ANGLE bug is fixed
DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsANGLESwiftShader());
wgpu::RenderPipeline pipeline = wgpu::RenderPipeline pipeline =
MakeTestPipeline(wgpu::IndexFormat::Uint32, wgpu::PrimitiveTopology::LineStrip); MakeTestPipeline(wgpu::IndexFormat::Uint32, wgpu::PrimitiveTopology::LineStrip);