[Mesa-dev] [PATCH 1/4] ac/addrlib: relax an assertion

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haehnle at amd.com>

This assertion is triggered on Stoney in Piglit
./bin/framebuffer-blit-levels {draw,read} stencil -auto -fbo
and similar tests. It should be harmless -- just relax it until
we can get internal clarification.
---
 src/amd/addrlib/r800/ciaddrlib.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/addrlib/r800/ciaddrlib.cpp b/src/amd/addrlib/r800/ciaddrlib.cpp
index 5dd52dd233e..4f67350c82f 100644
--- a/src/amd/addrlib/r800/ciaddrlib.cpp
+++ b/src/amd/addrlib/r800/ciaddrlib.cpp
@@ -740,21 +740,21 @@ ADDR_E_RETURNCODE CiLib::HwlComputeSurfaceInfo(
             {
                 pOut->macroModeIndex = TileIndexInvalid;
 
                 ADDR_COMPUTE_SURFACE_INFO_INPUT localIn = *pIn;
                 localIn.tileIndex = TileIndexInvalid;
                 localIn.pTileInfo = NULL;
                 localIn.flags.tcCompatible = FALSE;
 
                 SiLib::HwlComputeSurfaceInfo(&localIn, pOut);
 
-                ADDR_ASSERT((MinDepth2DThinIndex <= pOut->tileIndex) && (MaxDepth2DThinIndex >= pOut->tileIndex));
+                ADDR_ASSERT(((MinDepth2DThinIndex <= pOut->tileIndex) && (MaxDepth2DThinIndex >= pOut->tileIndex)) || pOut->tileIndex == Depth1DThinIndex);
 
                 depthStencil2DTileConfigMatch = DepthStencilTileCfgMatch(pIn, pOut);
             }
 
             if ((depthStencil2DTileConfigMatch == FALSE) &&
                 (pIn->numSamples <= 1))
             {
                 pOut->macroModeIndex = TileIndexInvalid;
 
                 ADDR_COMPUTE_SURFACE_INFO_INPUT localIn = *pIn;
-- 
2.11.0