[Mesa-dev] [PATCH 03/12] amd/addrlib: mark *pEqToCheck as MAYBE_UNUSED in Addr::V2::Gfx9Lib::ComputeStereoInfo

[Marek Olšák]

On Sat, Aug 18, 2018 at 7:16 AM Kai Wasserbäch
<kai at dev.carbon-project.org> wrote:
>
> Only used, when asserts are enabled.
>
> Fixes an unused-variable warning with GCC 8:
>  ../../../src/amd/addrlib/gfx9/gfx9addrlib.cpp: In member function 'ADDR_E_RETURNCODE Addr::V2::Gfx9Lib::ComputeStereoInfo(const ADDR2_COMPUTE_SURFACE_INFO_INPUT*, ADDR2_COMPUTE_SURFACE_INFO_OUTPUT*, unsigned int*) const':
>  ../../../src/amd/addrlib/gfx9/gfx9addrlib.cpp:3879:34: warning: unused variable 'pEqToCheck' [-Wunused-variable]
>               const ADDR_EQUATION *pEqToCheck        = &m_equationTable[eqIndex];
>                                    ^~~~~~~~~~
>
> Cc: Marek Olšák <maraeo at gmail.com>
> Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
> ---
>  src/amd/addrlib/gfx9/gfx9addrlib.cpp | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/amd/addrlib/gfx9/gfx9addrlib.cpp b/src/amd/addrlib/gfx9/gfx9addrlib.cpp
> index 853a041158..524b0f6e82 100644
> --- a/src/amd/addrlib/gfx9/gfx9addrlib.cpp
> +++ b/src/amd/addrlib/gfx9/gfx9addrlib.cpp
> @@ -3873,12 +3873,12 @@ ADDR_E_RETURNCODE Gfx9Lib::ComputeStereoInfo(
>      {
>          if (IsXor(pIn->swizzleMode))
>          {
> -            const UINT_32        blkSizeLog2       = GetBlockSizeLog2(pIn->swizzleMode);
> -            const UINT_32        numPipeBits       = GetPipeXorBits(blkSizeLog2);
> -            const UINT_32        numBankBits       = GetBankXorBits(blkSizeLog2);
> -            const UINT_32        bppLog2           = Log2(pIn->bpp >> 3);
> -            const UINT_32        maxYCoordBlock256 = Log2(Block256_2d[bppLog2].h) - 1;
> -            const ADDR_EQUATION *pEqToCheck        = &m_equationTable[eqIndex];
> +            const UINT_32                     blkSizeLog2       = GetBlockSizeLog2(pIn->swizzleMode);
> +            const UINT_32                     numPipeBits       = GetPipeXorBits(blkSizeLog2);
> +            const UINT_32                     numBankBits       = GetBankXorBits(blkSizeLog2);
> +            const UINT_32                     bppLog2           = Log2(pIn->bpp >> 3);
> +            const UINT_32                     maxYCoordBlock256 = Log2(Block256_2d[bppLog2].h) - 1;

Please don't change the formatting of unrelated code.

Marek

> +            MAYBE_UNUSED const ADDR_EQUATION *pEqToCheck        = &m_equationTable[eqIndex];
>
>              ADDR_ASSERT(maxYCoordBlock256 ==
>                          GetMaxValidChannelIndex(&pEqToCheck->addr[0], GetBlockSizeLog2(ADDR_SW_256B), 1));
> --
> 2.18.0
>