Remove DAWN_SKIP_TEST_IF -- Part I
This is the first part to completely replace DAWN_SKIP_TEST_IF
with DAWN_SUPPRESS_TEST_IF or DAWN_TEST_UNSUPPORTED_IF.
BUG=dawn:779
Change-Id: I1795eb4271de08667d43f24b64b42d15ca4b8071
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/51721
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>
diff --git a/src/tests/end2end/BasicTests.cpp b/src/tests/end2end/BasicTests.cpp
index e8f4d8a..bc31656 100644
--- a/src/tests/end2end/BasicTests.cpp
+++ b/src/tests/end2end/BasicTests.cpp
@@ -20,14 +20,14 @@
// Test adapter filter by vendor id.
TEST_P(BasicTests, VendorIdFilter) {
- DAWN_SKIP_TEST_IF(!HasVendorIdFilter());
+ DAWN_TEST_UNSUPPORTED_IF(!HasVendorIdFilter());
ASSERT_EQ(GetAdapterProperties().vendorID, GetVendorIdFilter());
}
// Test adapter filter by backend type.
TEST_P(BasicTests, BackendType) {
- DAWN_SKIP_TEST_IF(!HasBackendTypeFilter());
+ DAWN_TEST_UNSUPPORTED_IF(!HasBackendTypeFilter());
ASSERT_EQ(GetAdapterProperties().backendType, GetBackendTypeFilter());
}
diff --git a/src/tests/end2end/BindGroupTests.cpp b/src/tests/end2end/BindGroupTests.cpp
index 623ad50..4913823 100644
--- a/src/tests/end2end/BindGroupTests.cpp
+++ b/src/tests/end2end/BindGroupTests.cpp
@@ -932,7 +932,7 @@
// Test that bind group bindings may have unbounded and arbitrary binding numbers
TEST_P(BindGroupTests, ArbitraryBindingNumbers) {
// TODO(crbug.com/dawn/736): Test output is wrong with D3D12 + WARP.
- DAWN_SKIP_TEST_IF(IsD3D12() && IsWARP());
+ DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP());
utils::BasicRenderPass renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
@@ -1142,7 +1142,7 @@
// used correctly. The test loads a different value from each binding, and writes 1 to a storage
// buffer if all values are correct.
TEST_P(BindGroupTests, ReallyLargeBindGroup) {
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
std::ostringstream interface;
std::ostringstream body;
uint32_t binding = 0;
diff --git a/src/tests/end2end/BufferTests.cpp b/src/tests/end2end/BufferTests.cpp
index bbdfc4d..25b0fde 100644
--- a/src/tests/end2end/BufferTests.cpp
+++ b/src/tests/end2end/BufferTests.cpp
@@ -649,7 +649,7 @@
// Test that creating a zero-sized error buffer mapped. (it is a different code path)
TEST_P(BufferMappedAtCreationTests, ZeroSizedErrorBuffer) {
- DAWN_SKIP_TEST_IF(HasToggleEnabled("skip_validation"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("skip_validation"));
wgpu::BufferDescriptor descriptor;
descriptor.size = 0;
@@ -708,9 +708,9 @@
// Test that creating a very large buffers fails gracefully.
TEST_P(BufferTests, CreateBufferOOM) {
// TODO(http://crbug.com/dawn/749): Missing support.
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
- DAWN_SKIP_TEST_IF(IsAsan());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsAsan());
wgpu::BufferDescriptor descriptor;
descriptor.usage = wgpu::BufferUsage::CopyDst;
@@ -726,9 +726,9 @@
// Test that a very large buffer mappedAtCreation fails gracefully.
TEST_P(BufferTests, BufferMappedAtCreationOOM) {
// TODO(http://crbug.com/dawn/749): Missing support.
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
- DAWN_SKIP_TEST_IF(IsAsan());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsAsan());
// Test non-mappable buffer
{
@@ -772,9 +772,9 @@
// Test that mapping an OOM buffer fails gracefully
TEST_P(BufferTests, CreateBufferOOMMapAsync) {
// TODO(http://crbug.com/dawn/749): Missing support.
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
- DAWN_SKIP_TEST_IF(IsAsan());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsAsan());
auto RunTest = [this](const wgpu::BufferDescriptor& descriptor) {
wgpu::Buffer buffer;
diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp
index 0be8244..bef92f6 100644
--- a/src/tests/end2end/BufferZeroInitTests.cpp
+++ b/src/tests/end2end/BufferZeroInitTests.cpp
@@ -957,7 +957,7 @@
// the first use of the buffer and the texture is a 2D array texture.
TEST_P(BufferZeroInitTest, Copy2DArrayTextureToBuffer) {
// TODO(crbug.com/dawn/593): This test uses glTextureView() which is not supported on OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
constexpr wgpu::Extent3D kTextureSize = {64u, 4u, 3u};
@@ -989,7 +989,7 @@
// uniform buffer.
TEST_P(BufferZeroInitTest, BoundAsUniformBuffer) {
// TODO(crbug.com/dawn/661): Diagnose and fix this backend validation failure on GLES.
- DAWN_SKIP_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
constexpr uint32_t kBoundBufferSize = 16u;
wgpu::ShaderModule module = utils::CreateShaderModule(device, R"(
@@ -1028,7 +1028,7 @@
// read-only storage buffer.
TEST_P(BufferZeroInitTest, BoundAsReadonlyStorageBuffer) {
// TODO(crbug.com/dawn/661): Diagnose and fix this backend validation failure on GLES.
- DAWN_SKIP_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
constexpr uint32_t kBoundBufferSize = 16u;
wgpu::ShaderModule module = utils::CreateShaderModule(device, R"(
@@ -1067,7 +1067,7 @@
// storage buffer.
TEST_P(BufferZeroInitTest, BoundAsStorageBuffer) {
// TODO(crbug.com/dawn/661): Diagnose and fix this backend validation failure on GLES.
- DAWN_SKIP_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
constexpr uint32_t kBoundBufferSize = 32u;
wgpu::ShaderModule module = utils::CreateShaderModule(device, R"(
@@ -1178,7 +1178,7 @@
// DispatchIndirect.
TEST_P(BufferZeroInitTest, IndirectBufferForDispatchIndirect) {
// TODO(crbug.com/dawn/661): Diagnose and fix this backend validation failure on GLES.
- DAWN_SKIP_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
// Bind the whole buffer as an indirect buffer.
{
@@ -1196,14 +1196,14 @@
// Test the buffer will be lazily initialized correctly when its first use is in resolveQuerySet
TEST_P(BufferZeroInitTest, ResolveQuerySet) {
// Timestamp query is not supported on OpenGL
- DAWN_SKIP_TEST_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
// TODO(hao.x.li@intel.com): Crash occurs if we only call WriteTimestamp in a command encoder
// without any copy commands on Metal on AMD GPU. See https://crbug.com/dawn/545.
- DAWN_SKIP_TEST_IF(IsMetal() && IsAMD());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsAMD());
// Skip if timestamp extension is not supported on device
- DAWN_SKIP_TEST_IF(!SupportsExtensions({"timestamp_query"}));
+ DAWN_TEST_UNSUPPORTED_IF(!SupportsExtensions({"timestamp_query"}));
constexpr uint64_t kBufferSize = 16u;
constexpr wgpu::BufferUsage kBufferUsage =
diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp
index 5a4266c..9e618fa 100644
--- a/src/tests/end2end/ColorStateTests.cpp
+++ b/src/tests/end2end/ColorStateTests.cpp
@@ -32,7 +32,7 @@
// TODO(crbug.com/dawn/489): D3D12_Microsoft_Basic_Render_Driver_CPU
// produces invalid results for these tests.
- DAWN_SKIP_TEST_IF(IsD3D12() && IsWARP());
+ DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP());
vsModule = utils::CreateShaderModule(device, R"(
[[stage(vertex)]]
@@ -760,7 +760,7 @@
// Test that independent color states on render targets works
TEST_P(ColorStateTest, IndependentColorState) {
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_indexed_draw_buffers"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_indexed_draw_buffers"));
std::array<wgpu::Texture, 4> renderTargets;
std::array<wgpu::TextureView, 4> renderTargetViews;
diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp
index efe4a24..8968332 100644
--- a/src/tests/end2end/CompressedTextureFormatTests.cpp
+++ b/src/tests/end2end/CompressedTextureFormatTests.cpp
@@ -432,9 +432,9 @@
// Test copying into the whole BC texture with 2x2 blocks and sampling from it.
TEST_P(CompressedTextureBCFormatTest, Basic) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -449,7 +449,7 @@
// Test copying into a sub-region of a texture with BC formats works correctly.
TEST_P(CompressedTextureBCFormatTest, CopyIntoSubRegion) {
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -469,12 +469,12 @@
// Test copying into the non-zero layer of a 2D array texture with BC formats works correctly.
TEST_P(CompressedTextureBCFormatTest, CopyIntoNonZeroArrayLayer) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// This test uses glTextureView() which is not supported in OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -494,12 +494,12 @@
// Test copying into a non-zero mipmap level of a texture with BC texture formats.
TEST_P(CompressedTextureBCFormatTest, CopyBufferIntoNonZeroMipmapLevel) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// This test uses glTextureView() which is not supported in OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -533,17 +533,17 @@
// Test texture-to-texture whole-size copies with BC formats.
TEST_P(CompressedTextureBCFormatTest, CopyWholeTextureSubResourceIntoNonZeroMipmapLevel) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// This test uses glTextureView() which is not supported in OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// TODO(cwallez@chromium.org): This consistently fails on with the 12th pixel being opaque black
// instead of opaque red on Win10 FYI Release (NVIDIA GeForce GTX 1660). See
// https://bugs.chromium.org/p/chromium/issues/detail?id=981393
- DAWN_SKIP_TEST_IF(IsWindows() && IsVulkan() && IsNvidia());
+ DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsNvidia());
CopyConfig config;
config.textureDescriptor.size = {60, 60, 1};
@@ -589,11 +589,11 @@
// Test BC format texture-to-texture partial copies where the physical size of the destination
// subresource is different from its virtual size.
TEST_P(CompressedTextureBCFormatTest, CopyIntoSubresourceWithPhysicalSizeNotEqualToVirtualSize) {
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// TODO(jiawei.shao@intel.com): add workaround on the T2T copies where Extent3D fits in one
// subresource and does not fit in another one on OpenGL.
- DAWN_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGL() || IsOpenGLES());
CopyConfig srcConfig;
srcConfig.textureDescriptor.size = {60, 60, 1};
@@ -649,11 +649,11 @@
// Test BC format texture-to-texture partial copies where the physical size of the source
// subresource is different from its virtual size.
TEST_P(CompressedTextureBCFormatTest, CopyFromSubresourceWithPhysicalSizeNotEqualToVirtualSize) {
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// TODO(jiawei.shao@intel.com): add workaround on the T2T copies where Extent3D fits in one
// subresource and does not fit in another one on OpenGL.
- DAWN_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGL() || IsOpenGLES());
CopyConfig srcConfig;
srcConfig.textureDescriptor.size = {60, 60, 1};
@@ -705,11 +705,11 @@
// Test recording two BC format texture-to-texture partial copies where the physical size of the
// source subresource is different from its virtual size into one command buffer.
TEST_P(CompressedTextureBCFormatTest, MultipleCopiesWithPhysicalSizeNotEqualToVirtualSize) {
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// TODO(jiawei.shao@intel.com): add workaround on the T2T copies where Extent3D fits in one
// subresource and does not fit in another one on OpenGL.
- DAWN_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGL() || IsOpenGLES());
constexpr uint32_t kTotalCopyCount = 2;
std::array<CopyConfig, kTotalCopyCount> srcConfigs;
@@ -785,11 +785,11 @@
// Vulkan backend: test BC format texture-to-texture partial copies with multiple array layers
// where the physical size of the source subresource is different from its virtual size.
TEST_P(CompressedTextureBCFormatTest, CopyWithMultipleLayerAndPhysicalSizeNotEqualToVirtualSize) {
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// TODO(jiawei.shao@intel.com): add workaround on the T2T copies where Extent3D fits in one
// subresource and does not fit in another one on OpenGL.
- DAWN_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGL() || IsOpenGLES());
constexpr uint32_t kArrayLayerCount = 5;
@@ -858,9 +858,9 @@
// extent exactly fit the RowPitch.
TEST_P(CompressedTextureBCFormatTest, BufferOffsetAndExtentFitRowPitch) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -887,9 +887,9 @@
// ComputeTexelOffsets().
TEST_P(CompressedTextureBCFormatTest, BufferOffsetExceedsSlicePitch) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -918,9 +918,9 @@
// extent exceed the RowPitch. On D3D12 backend two copies are required for this case.
TEST_P(CompressedTextureBCFormatTest, CopyWithBufferOffsetAndExtentExceedRowPitch) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -947,7 +947,7 @@
// bytesPerRow. On D3D12 backend the texelOffset.z will be greater than 0 after calcuting the
// texelOffset in the function ComputeTexelOffsets().
TEST_P(CompressedTextureBCFormatTest, RowPitchEqualToSlicePitch) {
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -975,9 +975,9 @@
// for BC formats, on Metal backend we will use two copies to implement such copy.
TEST_P(CompressedTextureBCFormatTest, LargeImageHeight) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -996,12 +996,12 @@
// copyExtent.depthOrArrayLayers) and copyExtent needs to be clamped.
TEST_P(CompressedTextureBCFormatTest, LargeImageHeightAndClampedCopyExtent) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// This test uses glTextureView() which is not supported in OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -1038,12 +1038,12 @@
// BC formats.
TEST_P(CompressedTextureBCFormatTest, CopyWhole2DArrayTexture) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// This test uses glTextureView() which is not supported in OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
constexpr uint32_t kArrayLayerCount = 3;
@@ -1064,12 +1064,12 @@
// Test copying a multiple 2D texture array layers in one copy command works with BC formats.
TEST_P(CompressedTextureBCFormatTest, CopyMultiple2DArrayLayers) {
// TODO(jiawei.shao@intel.com): find out why this test fails on Windows Intel OpenGL drivers.
- DAWN_SKIP_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsIntel() && IsOpenGL() && IsWindows());
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
// This test uses glTextureView() which is not supported in OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
constexpr uint32_t kArrayLayerCount = 3;
@@ -1094,8 +1094,8 @@
// is unaligned doesn't throw validation errors.
TEST_P(CompressedTextureBCFormatTest, UnalignedDynamicUploader) {
// CopyT2B for compressed texture formats is unimplemented on OpenGL.
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
utils::UnalignDynamicUploader(device);
@@ -1133,7 +1133,7 @@
protected:
void SetUp() override {
CompressedTextureBCFormatTest::SetUp();
- DAWN_SKIP_TEST_IF(!IsBCFormatSupported());
+ DAWN_TEST_UNSUPPORTED_IF(!IsBCFormatSupported());
}
// Write the compressed texture data into the destination texture as is specified in copyConfig.
@@ -1185,7 +1185,7 @@
// Test writing to multiple 2D texture array layers with BC formats.
TEST_P(CompressedTextureWriteTextureTest, WriteMultiple2DArrayLayers) {
// TODO(crbug.com/dawn/593): This test uses glTextureView() which is not supported on OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
CopyConfig config;
config.textureDescriptor.usage = kDefaultBCFormatTextureUsage;
@@ -1207,7 +1207,7 @@
TEST_P(CompressedTextureWriteTextureTest,
WriteIntoSubresourceWithPhysicalSizeNotEqualToVirtualSize) {
// TODO(crbug.com/dawn/593): This test uses glTextureView() which is not supported on OpenGL ES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// Texture virtual size at mipLevel 2 will be {15, 15, 1} while the physical
// size will be {16, 16, 1}.
diff --git a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp b/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp
index fedaf5e..3cfa6dc 100644
--- a/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp
+++ b/src/tests/end2end/ComputeStorageBufferBarrierTests.cpp
@@ -351,7 +351,7 @@
TEST_P(ComputeStorageBufferBarrierTests, IndirectBufferCorrectBarrier) {
// For some reason SPIRV-Cross crashes when translating the step3 shader to HLSL. Suppress the
// failure since we'll remove SPIRV-Cross at some point.
- DAWN_SKIP_TEST_IF(IsD3D12() && !HasToggleEnabled("use_tint_generator"));
+ DAWN_SUPPRESS_TEST_IF(IsD3D12() && !HasToggleEnabled("use_tint_generator"));
wgpu::ComputePipelineDescriptor step2PipelineDesc;
step2PipelineDesc.computeStage.entryPoint = "main";
diff --git a/src/tests/end2end/CopyTests.cpp b/src/tests/end2end/CopyTests.cpp
index f26d8c1..f594e93 100644
--- a/src/tests/end2end/CopyTests.cpp
+++ b/src/tests/end2end/CopyTests.cpp
@@ -989,7 +989,7 @@
// Test that copying a range of texture 3D depths in one texture-to-buffer-copy works.
TEST_P(CopyTests_T2B, Texture3DSubRegion) {
- DAWN_SKIP_TEST_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
+ DAWN_TEST_UNSUPPORTED_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
@@ -1006,7 +1006,7 @@
}
TEST_P(CopyTests_T2B, Texture3DNoSplitRowDataWithEmptyFirstRow) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 2;
constexpr uint32_t kHeight = 4;
@@ -1029,7 +1029,7 @@
}
TEST_P(CopyTests_T2B, Texture3DSplitRowDataWithoutEmptyFirstRow) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 259;
constexpr uint32_t kHeight = 127;
@@ -1047,7 +1047,7 @@
}
TEST_P(CopyTests_T2B, Texture3DSplitRowDataWithEmptyFirstRow) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 39;
constexpr uint32_t kHeight = 4;
@@ -1070,7 +1070,7 @@
}
TEST_P(CopyTests_T2B, Texture3DCopyHeightIsOneCopyWidthIsTiny) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 2;
constexpr uint32_t kHeight = 1;
@@ -1093,7 +1093,7 @@
}
TEST_P(CopyTests_T2B, Texture3DCopyHeightIsOneCopyWidthIsSmall) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 39;
constexpr uint32_t kHeight = 1;
@@ -1572,7 +1572,7 @@
// Test that copying a range of texture 3D Depths in one texture-to-buffer-copy works.
TEST_P(CopyTests_B2T, Texture3DSubRegion) {
- DAWN_SKIP_TEST_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
+ DAWN_TEST_UNSUPPORTED_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
@@ -1589,7 +1589,7 @@
}
TEST_P(CopyTests_B2T, Texture3DNoSplitRowDataWithEmptyFirstRow) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 2;
constexpr uint32_t kHeight = 4;
@@ -1612,7 +1612,7 @@
}
TEST_P(CopyTests_B2T, Texture3DSplitRowDataWithoutEmptyFirstRow) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 259;
constexpr uint32_t kHeight = 127;
@@ -1630,7 +1630,7 @@
}
TEST_P(CopyTests_B2T, Texture3DSplitRowDataWithEmptyFirstRow) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 39;
constexpr uint32_t kHeight = 4;
@@ -1653,7 +1653,7 @@
}
TEST_P(CopyTests_B2T, Texture3DCopyHeightIsOneCopyWidthIsTiny) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 2;
constexpr uint32_t kHeight = 1;
@@ -1676,7 +1676,7 @@
}
TEST_P(CopyTests_B2T, Texture3DCopyHeightIsOneCopyWidthIsSmall) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 39;
constexpr uint32_t kHeight = 1;
@@ -1919,7 +1919,7 @@
TEST_P(CopyTests_T2B, CopyOneRowWithDepth32Float) {
// Currently this test fails on many D3D12 drivers. See https://crbug.com/dawn/727 for more
// details.
- DAWN_SKIP_TEST_IF(IsD3D12());
+ DAWN_SUPPRESS_TEST_IF(IsD3D12());
constexpr wgpu::TextureFormat kFormat = wgpu::TextureFormat::Depth32Float;
constexpr uint32_t kPixelsPerRow = 4u;
@@ -1969,7 +1969,7 @@
// This test can pass on the Windows Intel Vulkan driver version 27.20.100.9168.
// TODO(jiawei.shao@intel.com): enable this test on Intel Vulkan drivers after the upgrade of
// try bots.
- DAWN_SKIP_TEST_IF(IsVulkan() && IsWindows() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsVulkan() && IsWindows() && IsIntel());
constexpr std::array<wgpu::TextureFormat, 11> kFormats = {
{wgpu::TextureFormat::RG8Sint, wgpu::TextureFormat::RG8Uint, wgpu::TextureFormat::RG8Snorm,
@@ -2031,7 +2031,7 @@
// Test that copying whole 3D texture to a 2D array in one texture-to-texture-copy works.
TEST_P(CopyTests_T2T, Texture3DTo2DArrayFull) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
@@ -2046,7 +2046,7 @@
// Test that copying whole 2D array to a 3D texture in one texture-to-texture-copy works.
TEST_P(CopyTests_T2T, Texture2DArrayTo3DFull) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
@@ -2061,8 +2061,8 @@
// Test that copying subregion of a 3D texture in one texture-to-texture-copy works.
TEST_P(CopyTests_T2T, Texture3DSubRegion) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
- DAWN_SKIP_TEST_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
@@ -2077,7 +2077,7 @@
// Test that copying subregion of a 3D texture to a 2D array in one texture-to-texture-copy works.
TEST_P(CopyTests_T2T, Texture3DTo2DArraySubRegion) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
@@ -2093,8 +2093,8 @@
// Test that copying subregion of a 2D array to a 3D texture to in one texture-to-texture-copy
// works.
TEST_P(CopyTests_T2T, Texture2DArrayTo3DSubRegion) {
- DAWN_SKIP_TEST_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
- DAWN_SKIP_TEST_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
+ DAWN_TEST_UNSUPPORTED_IF(IsD3D12()); // TODO(crbug.com/dawn/547): Implement on D3D12.
+ DAWN_TEST_UNSUPPORTED_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
diff --git a/src/tests/end2end/CopyTextureForBrowserTests.cpp b/src/tests/end2end/CopyTextureForBrowserTests.cpp
index a2c337a..ffcf2fc 100644
--- a/src/tests/end2end/CopyTextureForBrowserTests.cpp
+++ b/src/tests/end2end/CopyTextureForBrowserTests.cpp
@@ -459,7 +459,7 @@
TEST_P(CopyTextureForBrowserTests, FromRGBA8UnormCopy) {
// Skip OpenGLES backend because it fails on using RGBA8Unorm as
// source texture format.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
for (wgpu::TextureFormat dstFormat : kDstTextureFormat) {
TextureSpec srcTextureSpec = {}; // default format is RGBA8Unorm
@@ -476,7 +476,7 @@
TEST_P(CopyTextureForBrowserTests, FromBGRA8UnormCopy) {
// Skip OpenGLES backend because it fails on using BGRA8Unorm as
// source texture format.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
for (wgpu::TextureFormat dstFormat : kDstTextureFormat) {
TextureSpec srcTextureSpec;
@@ -495,7 +495,7 @@
// in dst texture should be red and other part should remain green.
TEST_P(CopyTextureForBrowserTests, CopySubRect) {
// Tests skip due to crbug.com/dawn/592.
- DAWN_SKIP_TEST_IF(IsD3D12() && IsBackendValidationEnabled());
+ DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsBackendValidationEnabled());
for (wgpu::Origin3D srcOrigin : kOrigins) {
for (wgpu::Origin3D dstOrigin : kOrigins) {
diff --git a/src/tests/end2end/CreatePipelineAsyncTests.cpp b/src/tests/end2end/CreatePipelineAsyncTests.cpp
index f65f71b..a37e647 100644
--- a/src/tests/end2end/CreatePipelineAsyncTests.cpp
+++ b/src/tests/end2end/CreatePipelineAsyncTests.cpp
@@ -106,7 +106,7 @@
// CreateComputePipelineAsync() any error won't be forwarded to the error scope / unhandled error
// callback.
TEST_P(CreatePipelineAsyncTest, CreateComputePipelineFailed) {
- DAWN_SKIP_TEST_IF(HasToggleEnabled("skip_validation"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("skip_validation"));
wgpu::ComputePipelineDescriptor csDesc;
csDesc.computeStage.module = utils::CreateShaderModule(device, R"(
@@ -209,7 +209,7 @@
// CreateRenderPipelineAsync() any error won't be forwarded to the error scope / unhandled error
// callback.
TEST_P(CreatePipelineAsyncTest, CreateRenderPipelineFailed) {
- DAWN_SKIP_TEST_IF(HasToggleEnabled("skip_validation"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("skip_validation"));
constexpr wgpu::TextureFormat kRenderAttachmentFormat = wgpu::TextureFormat::Depth32Float;
diff --git a/src/tests/end2end/D3D12ResourceWrappingTests.cpp b/src/tests/end2end/D3D12ResourceWrappingTests.cpp
index b5fbeee..ce92a10 100644
--- a/src/tests/end2end/D3D12ResourceWrappingTests.cpp
+++ b/src/tests/end2end/D3D12ResourceWrappingTests.cpp
@@ -151,7 +151,7 @@
// Test a successful wrapping of an D3D12Resource in a texture
TEST_P(D3D12SharedHandleValidation, Success) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
wgpu::Texture texture;
ComPtr<ID3D11Texture2D> d3d11Texture;
@@ -162,7 +162,7 @@
// Test an error occurs if the texture descriptor is invalid
TEST_P(D3D12SharedHandleValidation, InvalidTextureDescriptor) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
wgpu::ChainedStruct chainedDescriptor;
baseDawnDescriptor.nextInChain = &chainedDescriptor;
@@ -177,7 +177,7 @@
// Test an error occurs if the descriptor mip level count isn't 1
TEST_P(D3D12SharedHandleValidation, InvalidMipLevelCount) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseDawnDescriptor.mipLevelCount = 2;
wgpu::Texture texture;
@@ -190,7 +190,7 @@
// Test an error occurs if the descriptor depth isn't 1
TEST_P(D3D12SharedHandleValidation, InvalidDepth) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseDawnDescriptor.size.depthOrArrayLayers = 2;
wgpu::Texture texture;
@@ -203,7 +203,7 @@
// Test an error occurs if the descriptor sample count isn't 1
TEST_P(D3D12SharedHandleValidation, InvalidSampleCount) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseDawnDescriptor.sampleCount = 4;
wgpu::Texture texture;
@@ -216,7 +216,7 @@
// Test an error occurs if the descriptor width doesn't match the texture's
TEST_P(D3D12SharedHandleValidation, InvalidWidth) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseDawnDescriptor.size.width = kTestWidth + 1;
wgpu::Texture texture;
@@ -229,7 +229,7 @@
// Test an error occurs if the descriptor height doesn't match the texture's
TEST_P(D3D12SharedHandleValidation, InvalidHeight) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseDawnDescriptor.size.height = kTestHeight + 1;
wgpu::Texture texture;
@@ -242,7 +242,7 @@
// Test an error occurs if the descriptor format isn't compatible with the D3D12 Resource
TEST_P(D3D12SharedHandleValidation, InvalidFormat) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseDawnDescriptor.format = wgpu::TextureFormat::R8Unorm;
wgpu::Texture texture;
@@ -255,7 +255,7 @@
// Test an error occurs if the number of D3D mip levels is greater than 1.
TEST_P(D3D12SharedHandleValidation, InvalidNumD3DMipLevels) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseD3dDescriptor.MipLevels = 2;
wgpu::Texture texture;
@@ -268,7 +268,7 @@
// Test an error occurs if the number of array levels is greater than 1.
TEST_P(D3D12SharedHandleValidation, InvalidD3DArraySize) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
baseD3dDescriptor.ArraySize = 2;
wgpu::Texture texture;
@@ -433,7 +433,7 @@
// 2. Copy the wrapped texture to another dawn texture
// 3. Readback the copied texture and ensure the color matches the original clear color.
TEST_P(D3D12SharedHandleUsageTests, ClearInD3D11CopyAndReadbackInD3D12) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
const wgpu::Color clearColor{1.0f, 1.0f, 0.0f, 1.0f};
wgpu::Texture dawnSrcTexture;
@@ -457,7 +457,7 @@
// 1. Create and clear a D3D11 texture
// 2. Readback the wrapped texture and ensure the color matches the original clear color.
TEST_P(D3D12SharedHandleUsageTests, ClearInD3D11ReadbackInD3D12) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
const wgpu::Color clearColor{1.0f, 1.0f, 0.0f, 1.0f};
wgpu::Texture dawnTexture;
@@ -480,9 +480,9 @@
TEST_P(D3D12SharedHandleUsageTests, ClearInD3D12ReadbackInD3D11) {
// TODO(crbug.com/dawn/735): This test appears to hang for
// D3D12_Microsoft_Basic_Render_Driver_CPU when validation is enabled.
- DAWN_SKIP_TEST_IF(IsD3D12() && IsWARP() && IsBackendValidationEnabled());
+ DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP() && IsBackendValidationEnabled());
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
const wgpu::Color d3d11ClearColor{1.0f, 1.0f, 0.0f, 1.0f};
wgpu::Texture dawnTexture;
@@ -510,9 +510,9 @@
TEST_P(D3D12SharedHandleUsageTests, ClearTwiceInD3D12ReadbackInD3D11) {
// TODO(crbug.com/dawn/735): This test appears to hang for
// D3D12_Microsoft_Basic_Render_Driver_CPU when validation is enabled.
- DAWN_SKIP_TEST_IF(IsD3D12() && IsWARP() && IsBackendValidationEnabled());
+ DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP() && IsBackendValidationEnabled());
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
const wgpu::Color d3d11ClearColor{1.0f, 1.0f, 0.0f, 1.0f};
wgpu::Texture dawnTexture;
@@ -540,7 +540,7 @@
// 2. Import the texture with isInitialized = false
// 3. Verify clearColor is not visible in wrapped texture
TEST_P(D3D12SharedHandleUsageTests, UninitializedTextureIsCleared) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
const wgpu::Color clearColor{1.0f, 0.0f, 0.0f, 1.0f};
wgpu::Texture dawnTexture;
@@ -559,7 +559,7 @@
// 2. Produce two Dawn textures from the external image.
// 3. Clear each Dawn texture and verify the texture was cleared to a unique color.
TEST_P(D3D12SharedHandleUsageTests, ReuseExternalImage) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
// Create the first Dawn texture then clear it to red.
wgpu::Texture texture;
@@ -603,7 +603,7 @@
// Produce a new texture with a usage not specified in the external image.
TEST_P(D3D12SharedHandleUsageTests, ExternalImageUsage) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
dawn_native::d3d12::ExternalImageAccessDescriptorDXGIKeyedMutex externalAccessDesc;
externalAccessDesc.acquireMutexKey = 1;
diff --git a/src/tests/end2end/D3D12VideoViewsTests.cpp b/src/tests/end2end/D3D12VideoViewsTests.cpp
index d5250a1..5b28d96 100644
--- a/src/tests/end2end/D3D12VideoViewsTests.cpp
+++ b/src/tests/end2end/D3D12VideoViewsTests.cpp
@@ -30,8 +30,8 @@
protected:
void SetUp() override {
DawnTest::SetUp();
- DAWN_SKIP_TEST_IF(UsesWire());
- DAWN_SKIP_TEST_IF(!IsMultiPlanarFormatsSupported());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(!IsMultiPlanarFormatsSupported());
// Create the D3D11 device/contexts that will be used in subsequent tests
ComPtr<ID3D12Device> d3d12Device = dawn_native::d3d12::GetD3D12Device(device.Get());
@@ -389,7 +389,7 @@
TEST_P(D3D12VideoViewsTests, NV12SampleYUVtoRGB) {
// TODO(https://crbug.com/dawn/733): Figure out why Nvidia bot occasionally fails testing all
// four corners.
- DAWN_SKIP_TEST_IF(IsNvidia());
+ DAWN_SUPPRESS_TEST_IF(IsNvidia());
wgpu::Texture wgpuTexture;
CreateVideoTextureForTest(wgpu::TextureFormat::R8BG8Biplanar420Unorm,
diff --git a/src/tests/end2end/DeprecatedAPITests.cpp b/src/tests/end2end/DeprecatedAPITests.cpp
index a611e83..ce3a8a0 100644
--- a/src/tests/end2end/DeprecatedAPITests.cpp
+++ b/src/tests/end2end/DeprecatedAPITests.cpp
@@ -31,7 +31,7 @@
void SetUp() override {
DawnTest::SetUp();
// Skip when validation is off because warnings might be emitted during validation calls
- DAWN_SKIP_TEST_IF(HasToggleEnabled("skip_validation"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("skip_validation"));
}
};
diff --git a/src/tests/end2end/DepthBiasTests.cpp b/src/tests/end2end/DepthBiasTests.cpp
index 6ce037e..348b82a 100644
--- a/src/tests/end2end/DepthBiasTests.cpp
+++ b/src/tests/end2end/DepthBiasTests.cpp
@@ -140,11 +140,11 @@
// Test adding positive bias to output
TEST_P(DepthBiasTests, PositiveBiasOnFloat) {
// NVIDIA GPUs under Vulkan seem to be using a different scale than everyone else.
- DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia());
+ DAWN_SUPPRESS_TEST_IF(IsVulkan() && IsNvidia());
// OpenGL uses a different scale than the other APIs
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// Draw quad flat on z = 0.25 with 0.25 bias
RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0, QuadAngle::Flat,
@@ -163,8 +163,8 @@
// Test adding positive bias to output with a clamp
TEST_P(DepthBiasTests, PositiveBiasOnFloatWithClamp) {
// Clamping support in OpenGL is spotty
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// Draw quad flat on z = 0.25 with 0.25 bias clamped at 0.125.
RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0, QuadAngle::Flat,
@@ -183,10 +183,10 @@
// Test adding negative bias to output
TEST_P(DepthBiasTests, NegativeBiasOnFloat) {
// NVIDIA GPUs seems to be using a different scale than everyone else
- DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia());
+ DAWN_SUPPRESS_TEST_IF(IsVulkan() && IsNvidia());
// OpenGL uses a different scale than the other APIs
- DAWN_SKIP_TEST_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
// Draw quad flat on z = 0.25 with -0.25 bias, depth clear of 0.125
RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0.125, QuadAngle::Flat,
@@ -205,8 +205,8 @@
// Test adding negative bias to output with a clamp
TEST_P(DepthBiasTests, NegativeBiasOnFloatWithClamp) {
// Clamping support in OpenGL is spotty
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// Draw quad flat on z = 0.25 with -0.25 bias clamped at -0.125.
RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0, QuadAngle::Flat,
@@ -225,7 +225,7 @@
// Test adding positive infinite slope bias to output
TEST_P(DepthBiasTests, PositiveInfinitySlopeBiasOnFloat) {
// NVIDIA GPUs do not clamp values to 1 when using Inf slope bias.
- DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia());
+ DAWN_SUPPRESS_TEST_IF(IsVulkan() && IsNvidia());
// Draw quad with z from 0 to 0.5 with inf slope bias
RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0.125, QuadAngle::TiltedX, 0,
@@ -244,7 +244,7 @@
// Test adding positive infinite slope bias to output
TEST_P(DepthBiasTests, NegativeInfinityBiasOnFloat) {
// NVIDIA GPUs do not clamp values to 0 when using -Inf slope bias.
- DAWN_SKIP_TEST_IF(IsVulkan() && IsNvidia());
+ DAWN_SUPPRESS_TEST_IF(IsVulkan() && IsNvidia());
// Draw quad with z from 0 to 0.5 with -inf slope bias
RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0.125, QuadAngle::TiltedX, 0,
@@ -324,8 +324,8 @@
// Test adding positive bias to output with a clamp
TEST_P(DepthBiasTests, PositiveBiasOn24bitWithClamp) {
// Clamping support in OpenGL is spotty
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// Draw quad flat on z = 0.25 with 0.25 bias clamped at 0.125.
RunDepthBiasTest(wgpu::TextureFormat::Depth24PlusStencil8, 0.4f, QuadAngle::Flat,
diff --git a/src/tests/end2end/DepthStencilCopyTests.cpp b/src/tests/end2end/DepthStencilCopyTests.cpp
index b424eb8..9e0562b 100644
--- a/src/tests/end2end/DepthStencilCopyTests.cpp
+++ b/src/tests/end2end/DepthStencilCopyTests.cpp
@@ -330,7 +330,7 @@
TEST_P(DepthStencilCopyTests, FromStencilAspect) {
// TODO(crbug.com/dawn/667): Work around the fact that some platforms are unable to read
// stencil.
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_depth_stencil_read"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_depth_stencil_read"));
constexpr uint32_t kWidth = 4;
constexpr uint32_t kHeight = 4;
@@ -355,10 +355,10 @@
TEST_P(DepthStencilCopyTests, FromNonZeroMipStencilAspect) {
// TODO(enga): Figure out why this fails on MacOS Intel Iris.
// It passes on AMD Radeon Pro and Intel HD Graphics 630.
- DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
// TODO(crbug.com/dawn/667): Work around some platforms' inability to read back stencil.
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_depth_stencil_read"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_depth_stencil_read"));
wgpu::Texture depthStencilTexture = CreateDepthStencilTexture(
9, 9, wgpu::TextureUsage::RenderAttachment | wgpu::TextureUsage::CopySrc, 2);
@@ -400,10 +400,10 @@
// It passes on AMD Radeon Pro and Intel HD Graphics 630.
// Maybe has to do with the RenderAttachment usage. Notably, a later test
// T2TBothAspectsThenCopyNonRenderableStencil does not use RenderAttachment and works correctly.
- DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
// TODO(crbug.com/dawn/667): Work around some platforms' inability to read back stencil.
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_depth_stencil_read"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_depth_stencil_read"));
constexpr uint32_t kWidth = 4;
constexpr uint32_t kHeight = 4;
@@ -427,7 +427,7 @@
// this test has different behavior on some platforms than T2TBothAspectsThenCopyStencil.
TEST_P(DepthStencilCopyTests, T2TBothAspectsThenCopyNonRenderableStencil) {
// TODO(crbug.com/dawn/667): Work around some platforms' inability to read back stencil.
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_depth_stencil_read"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_depth_stencil_read"));
constexpr uint32_t kWidth = 4;
constexpr uint32_t kHeight = 4;
@@ -453,10 +453,10 @@
// It passes on AMD Radeon Pro and Intel HD Graphics 630.
// Maybe has to do with the non-zero mip. Notably, a previous test
// T2TBothAspectsThenCopyNonRenderableStencil works correctly.
- DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
// TODO(crbug.com/dawn/667): Work around some platforms' inability to read back stencil.
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_depth_stencil_read"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_depth_stencil_read"));
wgpu::Texture texture = CreateInitializeDepthStencilTextureAndCopyT2T(
0.1f, 0.3f, 1u, 3u, 9, 9, wgpu::TextureUsage::CopySrc, 1);
@@ -508,7 +508,7 @@
// Test copying both aspects in a T2T copy, then copying stencil, then copying depth
TEST_P(DepthStencilCopyTests, T2TBothAspectsThenCopyStencilThenDepth) {
// TODO(crbug.com/dawn/667): Work around some platforms' inability to read back stencil.
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_depth_stencil_read"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_depth_stencil_read"));
constexpr uint32_t kWidth = 4;
constexpr uint32_t kHeight = 4;
@@ -544,11 +544,11 @@
// It seems like the depth readback copy mutates the stencil because the previous
// test T2TBothAspectsThenCopyStencil passes.
// T2TBothAspectsThenCopyStencilThenDepth which checks stencil first also passes.
- DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
// TODO(crbug.com/dawn/667): Work around the fact that some platforms are unable to read
// stencil.
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_depth_stencil_read"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_depth_stencil_read"));
constexpr uint32_t kWidth = 4;
constexpr uint32_t kHeight = 4;
@@ -580,12 +580,12 @@
// Test copying to the stencil-aspect of a buffer
TEST_P(DepthStencilCopyTests, ToStencilAspect) {
// Copies to a single aspect are unsupported on OpenGL.
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// TODO(enga): Figure out why this fails on MacOS Intel Iris.
// It passes on AMD Radeon Pro and Intel HD Graphics 630.
- DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
// Create a stencil texture
constexpr uint32_t kWidth = 4;
diff --git a/src/tests/end2end/DepthStencilSamplingTests.cpp b/src/tests/end2end/DepthStencilSamplingTests.cpp
index 009b799..41f83ca 100644
--- a/src/tests/end2end/DepthStencilSamplingTests.cpp
+++ b/src/tests/end2end/DepthStencilSamplingTests.cpp
@@ -552,7 +552,7 @@
// Test that sampling a stencil texture with a render/compute pipeline works
TEST_P(DepthStencilSamplingTest, SampleStencil) {
// TODO(crbug.com/dawn/593): This test requires glTextureView, which is unsupported on GLES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
for (wgpu::TextureFormat format : kStencilFormats) {
DoSamplingTest(TestAspect::Stencil, CreateSamplingRenderPipeline({TestAspect::Stencil}, 0),
format, kStencilValues);
@@ -566,12 +566,12 @@
// respectively
TEST_P(DepthStencilSamplingTest, SampleExtraComponents) {
// TODO(crbug.com/dawn/593): This test requires glTextureView, which is unsupported on GLES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// TODO(enga): In Metal, color textures' unspecified default components values
// are (0, 0, 0, 1). Depth/stencil textures are undefined! Figure out what
// to do here.
// See Section 6.10 of the Metal Shading Language Specification
- DAWN_SKIP_TEST_IF(IsMetal());
+ DAWN_SUPPRESS_TEST_IF(IsMetal());
float expectedDepth[4] = {0, 0, 0, 1};
uint8_t expectedStencil[4] = {0, 0, 0, 1};
@@ -598,7 +598,7 @@
// Test sampling both depth and stencil with a render/compute pipeline works.
TEST_P(DepthStencilSamplingTest, SampleDepthAndStencilRender) {
// TODO(crbug.com/dawn/593): This test requires glTextureView, which is unsupported on GLES.
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
wgpu::SamplerDescriptor samplerDesc;
wgpu::Sampler sampler = device.CreateSampler(&samplerDesc);
@@ -706,7 +706,7 @@
// Test that sampling in a render pipeline with all of the compare functions works.
TEST_P(DepthStencilSamplingTest, CompareFunctionsRender) {
// Initialization via renderPass loadOp doesn't work on Mac Intel.
- DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
wgpu::RenderPipeline pipeline = CreateComparisonRenderPipeline();
@@ -724,7 +724,7 @@
// Test that sampling in a render pipeline with all of the compare functions works.
TEST_P(DepthStencilSamplingTest, CompareFunctionsCompute) {
// Initialization via renderPass loadOp doesn't work on Mac Intel.
- DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
+ DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel());
wgpu::ComputePipeline pipeline = CreateComparisonComputePipeline();
diff --git a/src/tests/end2end/DepthStencilStateTests.cpp b/src/tests/end2end/DepthStencilStateTests.cpp
index dbd118d..5e41332 100644
--- a/src/tests/end2end/DepthStencilStateTests.cpp
+++ b/src/tests/end2end/DepthStencilStateTests.cpp
@@ -26,7 +26,7 @@
DawnTest::SetUp();
// TODO(crbug.com/dawn/737): Test output is wrong with D3D12 + WARP.
- DAWN_SKIP_TEST_IF(IsD3D12() && IsWARP());
+ DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP());
wgpu::TextureDescriptor renderTargetDescriptor;
renderTargetDescriptor.dimension = wgpu::TextureDimension::e2D;
diff --git a/src/tests/end2end/DestroyTests.cpp b/src/tests/end2end/DestroyTests.cpp
index 88bf140..b497e1c 100644
--- a/src/tests/end2end/DestroyTests.cpp
+++ b/src/tests/end2end/DestroyTests.cpp
@@ -23,7 +23,7 @@
protected:
void SetUp() override {
DawnTest::SetUp();
- DAWN_SKIP_TEST_IF(HasToggleEnabled("skip_validation"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("skip_validation"));
renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
diff --git a/src/tests/end2end/DeviceLostTests.cpp b/src/tests/end2end/DeviceLostTests.cpp
index 2441de5..db6e28a 100644
--- a/src/tests/end2end/DeviceLostTests.cpp
+++ b/src/tests/end2end/DeviceLostTests.cpp
@@ -51,7 +51,7 @@
protected:
void SetUp() override {
DawnTest::SetUp();
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
mockDeviceLostCallback = std::make_unique<MockDeviceLostCallback>();
mockQueueWorkDoneCallback = std::make_unique<MockQueueWorkDoneCallback>();
}
diff --git a/src/tests/end2end/DrawIndexedIndirectTests.cpp b/src/tests/end2end/DrawIndexedIndirectTests.cpp
index e6d87d9..0fc1211 100644
--- a/src/tests/end2end/DrawIndexedIndirectTests.cpp
+++ b/src/tests/end2end/DrawIndexedIndirectTests.cpp
@@ -100,7 +100,7 @@
// The most basic DrawIndexed triangle draw.
TEST_P(DrawIndexedIndirectTest, Uint32) {
// TODO(crbug.com/dawn/789): Test is failing after a roll on SwANGLE on Windows only.
- DAWN_SKIP_TEST_IF(IsANGLE() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsANGLE() && IsWindows());
RGBA8 filled(0, 255, 0, 255);
RGBA8 notFilled(0, 0, 0, 0);
@@ -122,8 +122,8 @@
TEST_P(DrawIndexedIndirectTest, BaseVertex) {
// TODO(crbug.com/dawn/161): add workaround for OpenGL index buffer offset (could be compute
// shader that adds it to the draw calls)
- DAWN_SKIP_TEST_IF(IsOpenGL());
- DAWN_SKIP_TEST_IF(IsOpenGLES());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGL());
+ DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
RGBA8 filled(0, 255, 0, 255);
RGBA8 notFilled(0, 0, 0, 0);
@@ -148,7 +148,7 @@
TEST_P(DrawIndexedIndirectTest, IndirectOffset) {
// TODO(crbug.com/dawn/789): Test is failing after a roll on SwANGLE on Windows only.
- DAWN_SKIP_TEST_IF(IsANGLE() && IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsANGLE() && IsWindows());
RGBA8 filled(0, 255, 0, 255);
RGBA8 notFilled(0, 0, 0, 0);
diff --git a/src/tests/end2end/DrawIndexedTests.cpp b/src/tests/end2end/DrawIndexedTests.cpp
index 3d3cf24..e055e26 100644
--- a/src/tests/end2end/DrawIndexedTests.cpp
+++ b/src/tests/end2end/DrawIndexedTests.cpp
@@ -178,7 +178,7 @@
// Test the parameter 'baseVertex' of DrawIndexed() works.
TEST_P(DrawIndexedTest, BaseVertex) {
- DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_base_vertex"));
+ DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_base_vertex"));
RGBA8 filled(0, 255, 0, 255);
RGBA8 notFilled(0, 0, 0, 0);
diff --git a/src/tests/end2end/DynamicBufferOffsetTests.cpp b/src/tests/end2end/DynamicBufferOffsetTests.cpp
index 6f557ff..c200f84 100644
--- a/src/tests/end2end/DynamicBufferOffsetTests.cpp
+++ b/src/tests/end2end/DynamicBufferOffsetTests.cpp
@@ -352,7 +352,7 @@
// Suspect it is due to dawn doesn't handle sync between two dispatch and disable this case.
// Will double check root cause after got GTX1660.
TEST_P(DynamicBufferOffsetTests, InheritDynamicOffestsComputePipeline) {
- DAWN_SKIP_TEST_IF(IsWindows());
+ DAWN_SUPPRESS_TEST_IF(IsWindows());
wgpu::ComputePipeline pipeline = CreateComputePipeline();
wgpu::ComputePipeline testPipeline = CreateComputePipeline(true);
diff --git a/src/tests/end2end/EntryPointTests.cpp b/src/tests/end2end/EntryPointTests.cpp
index e27390d..0c4dedc 100644
--- a/src/tests/end2end/EntryPointTests.cpp
+++ b/src/tests/end2end/EntryPointTests.cpp
@@ -22,7 +22,7 @@
// Test creating a render pipeline from two entryPoints in the same module.
TEST_P(EntryPointTests, FragAndVertexSameModule) {
// TODO(crbug.com/dawn/658): Crashes on bots
- DAWN_SKIP_TEST_IF(IsOpenGL() || IsOpenGLES());
+ DAWN_SUPPRESS_TEST_IF(IsOpenGL() || IsOpenGLES());
wgpu::ShaderModule module = utils::CreateShaderModule(device, R"(
[[stage(vertex)]] fn vertex_main() -> [[builtin(position)]] vec4<f32> {
return vec4<f32>(0.0, 0.0, 0.0, 1.0);
diff --git a/src/tests/end2end/ExternalTextureTests.cpp b/src/tests/end2end/ExternalTextureTests.cpp
index cfb48e4..3060815 100644
--- a/src/tests/end2end/ExternalTextureTests.cpp
+++ b/src/tests/end2end/ExternalTextureTests.cpp
@@ -43,7 +43,7 @@
} // anonymous namespace
TEST_P(ExternalTextureTests, CreateExternalTextureSuccess) {
- DAWN_SKIP_TEST_IF(UsesWire());
+ DAWN_TEST_UNSUPPORTED_IF(UsesWire());
wgpu::Texture texture = Create2DTexture(device, kWidth, kHeight, kFormat, kSampledUsage);
