diff options
| author | Marek Olšák <[email protected]> | 2017-03-30 19:01:02 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-03-30 19:17:39 +0200 |
| commit | 331714d72eb33bfcc401e99629dd3e416652a15a (patch) | |
| tree | 14bf4a1c1e5676f667ab352993ba2327e6868619 /src | |
| parent | 681adbc18ca934566a42e952fe20e26c39a2d0d1 (diff) | |
Partially revert "amd/addrlib: silence warnings" to fix builds with DEBUG
This partially reverts commit 8a74140a21fe6b0d2e8a60b065b890f797f2db51.
Diffstat (limited to 'src')
| -rw-r--r-- | src/amd/addrlib/addrinterface.cpp | 4 | ||||
| -rw-r--r-- | src/amd/addrlib/gfx9/gfx9addrlib.cpp | 2 | ||||
| -rw-r--r-- | src/amd/addrlib/r800/egbaddrlib.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/amd/addrlib/addrinterface.cpp b/src/amd/addrlib/addrinterface.cpp index 6a0c330dcc5..12985fc37b6 100644 --- a/src/amd/addrlib/addrinterface.cpp +++ b/src/amd/addrlib/addrinterface.cpp @@ -832,7 +832,7 @@ BOOL_32 ADDR_API ElemGetExportNorm( Addr::Lib* pLib = Lib::GetLib(hLib); BOOL_32 enabled = FALSE; - //ADDR_E_RETURNCODE returnCode = ADDR_OK; + ADDR_E_RETURNCODE returnCode = ADDR_OK; if (pLib != NULL) { @@ -840,7 +840,7 @@ BOOL_32 ADDR_API ElemGetExportNorm( } else { - //returnCode = ADDR_ERROR; + returnCode = ADDR_ERROR; } ADDR_ASSERT(returnCode == ADDR_OK); diff --git a/src/amd/addrlib/gfx9/gfx9addrlib.cpp b/src/amd/addrlib/gfx9/gfx9addrlib.cpp index fce0c000be9..380b785e595 100644 --- a/src/amd/addrlib/gfx9/gfx9addrlib.cpp +++ b/src/amd/addrlib/gfx9/gfx9addrlib.cpp @@ -2159,7 +2159,7 @@ ADDR_E_RETURNCODE Gfx9Lib::HwlComputeBlock256Equation( // Post validation if (ret == ADDR_OK) { - //Dim2d microBlockDim = Block256b[elementBytesLog2]; + Dim2d microBlockDim = Block256b[elementBytesLog2]; ADDR_ASSERT((2u << GetMaxValidChannelIndex(pEquation->addr, 8, 0)) == (microBlockDim.w * (1 << elementBytesLog2))); ADDR_ASSERT((2u << GetMaxValidChannelIndex(pEquation->addr, 8, 1)) == microBlockDim.h); diff --git a/src/amd/addrlib/r800/egbaddrlib.cpp b/src/amd/addrlib/r800/egbaddrlib.cpp index 03f3a3146e4..0cd27ada070 100644 --- a/src/amd/addrlib/r800/egbaddrlib.cpp +++ b/src/amd/addrlib/r800/egbaddrlib.cpp @@ -978,7 +978,7 @@ BOOL_32 EgBasedLib::SanityCheckMacroTiled( ) const { BOOL_32 valid = TRUE; - //UINT_32 numPipes = HwlGetPipes(pTileInfo); + UINT_32 numPipes = HwlGetPipes(pTileInfo); switch (pTileInfo->banks) { @@ -4748,7 +4748,7 @@ UINT_64 EgBasedLib::HwlGetSizeAdjustmentMicroTiled( ) const { UINT_64 logicalSliceSize; - //UINT_64 physicalSliceSize; + UINT_64 physicalSliceSize; UINT_32 pitch = *pPitch; UINT_32 height = *pHeight; @@ -4757,7 +4757,7 @@ UINT_64 EgBasedLib::HwlGetSizeAdjustmentMicroTiled( logicalSliceSize = BITS_TO_BYTES(static_cast<UINT_64>(pitch) * height * bpp * numSamples); // Physical slice: multiplied by thickness - //physicalSliceSize = logicalSliceSize * thickness; + physicalSliceSize = logicalSliceSize * thickness; // // R800 will always pad physical slice size to baseAlign which is pipe_interleave_bytes |