From 010f32bca0b4f211fa7adb9574c49bfcb75aa248 Mon Sep 17 00:00:00 2001
From: dan sinclair <dsinclair@chromium.org>
Date: Tue, 10 May 2022 13:31:16 +0000
Subject: [PATCH] [warnings] Add -Wunused-macros

This CL adds the `-Wunused-macros` warning and removes the unused macro
found.

Change-Id: I1b2aa925f89e19ff6184e34b59d5ee076cb3807c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/89560
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
---
 src/dawn/common/BUILD.gn                               | 1 +
 src/dawn/tests/end2end/NonzeroTextureCreationTests.cpp | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/dawn/common/BUILD.gn b/src/dawn/common/BUILD.gn
index 8a9c26db1f..9697500569 100644
--- a/src/dawn/common/BUILD.gn
+++ b/src/dawn/common/BUILD.gn
@@ -121,6 +121,7 @@ config("internal_config") {
       "-Wtautological-unsigned-zero-compare",
       "-Wunreachable-code-aggressive",
       "-Wunused-but-set-variable",
+      "-Wunused-macros",
     ]
 
     if (is_win) {
diff --git a/src/dawn/tests/end2end/NonzeroTextureCreationTests.cpp b/src/dawn/tests/end2end/NonzeroTextureCreationTests.cpp
index 25ab7189fe..33cb2c1ce0 100644
--- a/src/dawn/tests/end2end/NonzeroTextureCreationTests.cpp
+++ b/src/dawn/tests/end2end/NonzeroTextureCreationTests.cpp
@@ -68,9 +68,6 @@ class ExpectNonZero : public detail::CustomTextureExpectation {
     }
 };
 
-#define EXPECT_TEXTURE_NONZERO(T, ...) \
-    AddTextureExpectation(__FILE__, __LINE__, new ExpectNonZero<T>(), __VA_ARGS__)
-
 class NonzeroTextureCreationTests : public DawnTestWithParams<Params> {
   protected:
     constexpr static uint32_t kSize = 128;