From: Kai Wasserbäch <kai@dev.carbon-project.org>
Date: Tue, 21 Aug 2018 15:25:46 +0000 (+0200)
Subject: amd/addrlib: mark numPipes as MAYBE_UNUSED in Addr::V1::EgBasedLib::SanityCheckMacroT... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e0586e379a3989c43957972ee08210f01162685;p=mesa.git

amd/addrlib: mark numPipes as MAYBE_UNUSED in Addr::V1::EgBasedLib::SanityCheckMacroTiled (v2)

Only used, when asserts are enabled.

Fixes an unused-variable warning with GCC 8:
 ../../../src/amd/addrlib/r800/egbaddrlib.cpp: In member function 'int Addr::V1::EgBasedLib::SanityCheckMacroTiled(ADDR_TILEINFO*) const':
 ../../../src/amd/addrlib/r800/egbaddrlib.cpp:982:13: warning: unused variable 'numPipes' [-Wunused-variable]
      UINT_32 numPipes    = HwlGetPipes(pTileInfo);
              ^~~~~~~~

v2: Don't realign other variable definitions, to keep in line with file
    style (Marek)

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/amd/addrlib/r800/egbaddrlib.cpp b/src/amd/addrlib/r800/egbaddrlib.cpp
index 3947cfda2fd..905d443cfa9 100644
--- a/src/amd/addrlib/r800/egbaddrlib.cpp
+++ b/src/amd/addrlib/r800/egbaddrlib.cpp
@@ -33,6 +33,8 @@
 
 #include "egbaddrlib.h"
 
+#include "util/macros.h"
+
 namespace Addr
 {
 namespace V1
@@ -979,7 +981,7 @@ BOOL_32 EgBasedLib::SanityCheckMacroTiled(
     ) const
 {
     BOOL_32 valid       = TRUE;
-    UINT_32 numPipes    = HwlGetPipes(pTileInfo);
+    MAYBE_UNUSED UINT_32 numPipes = HwlGetPipes(pTileInfo);
 
     switch (pTileInfo->banks)
     {