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

Fix test suppression macros 

Changes several DAWN_TEST_UNSUPPORTED_IF macros that were erroneously
used to DAWN_SUPPRESS_TEST_IF.

Bug: dawn:1216, dawn:1217

Change-Id: Iaa0d7eb1b3aad8c0b11ff395cebaff0f15631beb
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/71524
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Brian Sheedy 2021-12-02 20:25:58 +00:00 committed by Dawn LUCI CQ
parent b8ac8b5c7a
commit 75f0f29507
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tests/end2end/CopyTests.cpp
View File

@ -2215,7 +2215,7 @@ TEST_P(CopyTests_T2T, Texture3DTo2DArrayFull) {
TEST_P(CopyTests_T2T, Texture3DAnd2DArraySubRegion) {
DAWN_TEST_UNSUPPORTED_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
// TODO(crbug.com/dawn/1216): Remove this suppression.
DAWN_TEST_UNSUPPORTED_IF(IsD3D12() && IsNvidia());
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
constexpr uint32_t kWidth = 8;
constexpr uint32_t kHeight = 4;
@ -2274,7 +2274,7 @@ TEST_P(CopyTests_T2T, Texture3DAnd2DArraySubRegion) {
// Test that copying whole 2D array to a 3D texture in one texture-to-texture-copy works.
TEST_P(CopyTests_T2T, Texture2DArrayTo3DFull) {
// TODO(crbug.com/dawn/1216): Remove this suppression.
DAWN_TEST_UNSUPPORTED_IF(IsD3D12() && IsNvidia());
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
constexpr uint32_t kDepth = 6u;
@ -2318,7 +2318,7 @@ TEST_P(CopyTests_T2T, Texture3DTo2DArraySubRegion) {
TEST_P(CopyTests_T2T, Texture2DArrayTo3DSubRegion) {
DAWN_TEST_UNSUPPORTED_IF(IsANGLE()); // TODO(crbug.com/angleproject/5967)
// TODO(crbug.com/dawn/1216): Remove this suppression.
DAWN_TEST_UNSUPPORTED_IF(IsD3D12() && IsNvidia());
DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsNvidia());
constexpr uint32_t kWidth = 256;
constexpr uint32_t kHeight = 128;
constexpr uint32_t kDepth = 6u;

2
src/tests/end2end/MaxLimitTests.cpp
View File

@ -106,7 +106,7 @@ TEST_P(MaxLimitTests, MaxBufferBindingSize) {
DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsIntel());
// TODO(crbug.com/dawn/1217): Remove this suppression.
DAWN_TEST_UNSUPPORTED_IF(IsWindows() && IsVulkan() && IsNvidia());
DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsNvidia());
for (wgpu::BufferUsage usage : {wgpu::BufferUsage::Storage, wgpu::BufferUsage::Uniform}) {
uint64_t maxBufferBindingSize;