From 8ffd3f23331dc56d3cd45d416e850cee88119330 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Wed, 22 Jan 2020 15:55:46 +0000 Subject: [PATCH] Move EXPECT_LAZY_CLEAR to TextureZeroInitTests.cpp This macro is used only for testing texture zero initialization so it didn't need to be in DawnTest.h Bug: Change-Id: Ifb7ed06d93ae1bc275c9fd4650858c9b27117b5e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/15360 Reviewed-by: Austin Eng Commit-Queue: Corentin Wallez --- src/tests/DawnTest.h | 10 ---------- src/tests/end2end/TextureZeroInitTests.cpp | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tests/DawnTest.h b/src/tests/DawnTest.h index 7e42b578c5..677f67007e 100644 --- a/src/tests/DawnTest.h +++ b/src/tests/DawnTest.h @@ -57,16 +57,6 @@ sizeof(float), \ new detail::ExpectEq(expected, (width) * (height))) -#define EXPECT_LAZY_CLEAR(N, statement) \ - if (UsesWire()) { \ - statement; \ - } else { \ - size_t lazyClearsBefore = dawn_native::GetLazyClearCountForTesting(device.Get()); \ - statement; \ - size_t lazyClearsAfter = dawn_native::GetLazyClearCountForTesting(device.Get()); \ - EXPECT_EQ(N, lazyClearsAfter - lazyClearsBefore); \ - } - // Should only be used to test validation of function that can't be tested by regular validation // tests; #define ASSERT_DEVICE_ERROR(statement) \ diff --git a/src/tests/end2end/TextureZeroInitTests.cpp b/src/tests/end2end/TextureZeroInitTests.cpp index 8c5a6215d1..7ceb8072b6 100644 --- a/src/tests/end2end/TextureZeroInitTests.cpp +++ b/src/tests/end2end/TextureZeroInitTests.cpp @@ -18,6 +18,16 @@ #include "utils/ComboRenderPipelineDescriptor.h" #include "utils/WGPUHelpers.h" +#define EXPECT_LAZY_CLEAR(N, statement) \ + if (UsesWire()) { \ + statement; \ + } else { \ + size_t lazyClearsBefore = dawn_native::GetLazyClearCountForTesting(device.Get()); \ + statement; \ + size_t lazyClearsAfter = dawn_native::GetLazyClearCountForTesting(device.Get()); \ + EXPECT_EQ(N, lazyClearsAfter - lazyClearsBefore); \ + } + class TextureZeroInitTest : public DawnTest { protected: void TestSetUp() override {