Clean up unused variable macros.

src/common/BitSetIterator_unittest.cpp

@@ -55,7 +55,7 @@ TEST_F(BitSetIteratorTest, EmptySet)
     for (unsigned long bit : IterateBitSet(mStateBits))
     {
         sawBit = true;
-        UNUSED_TRACE_VARIABLE(bit);
+        UNUSED_VARIABLE(bit);
     }
     EXPECT_FALSE(sawBit);
 }

src/common/debug.cpp

@@ -53,7 +53,7 @@ void output(bool traceInDebugOnly, MessageType messageType, DebugTraceOutputType
     }
 
     std::string formattedMessage;
-    UNUSED_TRACE_VARIABLE(formattedMessage);
+    UNUSED_VARIABLE(formattedMessage);
 
 #if !defined(NDEBUG) && defined(_MSC_VER)
     if (messageType == MESSAGE_ERR)

src/common/debug.h

@@ -114,11 +114,7 @@ bool DebugAnnotationsActive();
 #define UNUSED_ASSERTION_VARIABLE(variable) ((void)variable)
 #endif
 
-#ifndef ANGLE_ENABLE_DEBUG_TRACE
-#define UNUSED_TRACE_VARIABLE(variable) ((void)variable)
-#else
-#define UNUSED_TRACE_VARIABLE(variable)
-#endif
+#define UNUSED_VARIABLE(variable) ((void)variable)
 
 // A macro to indicate unimplemented functionality
 

src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp

@@ -805,10 +805,8 @@ EGLint SwapChain11::present(EGLint x, EGLint y, EGLint width, EGLint height)
 
     if (result == DXGI_ERROR_DEVICE_REMOVED)
     {
-        ID3D11Device *device  = mRenderer->getDevice();
-        HRESULT removedReason = device->GetDeviceRemovedReason();
-        UNUSED_TRACE_VARIABLE(removedReason);
-        ERR("Present failed: the D3D11 device was removed: 0x%08X", removedReason);
+        ERR("Present failed: the D3D11 device was removed: 0x%08X",
+            mRenderer->getDevice()->GetDeviceRemovedReason());
         return EGL_CONTEXT_LOST;
     }
     else if (result == DXGI_ERROR_DEVICE_RESET)