fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 23:09:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

amd: fix addrlib regression

Browse source 
This reverts only a small chunk of e01266335b because this
change caused this piglit test to page fault:

   nv_copy_image-formats --samples=8 GL_RGB32UI

Fixes: e01266335b ("amd: update addrlib")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28268>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2024-03-19 14:30:32 +01:00 • committed by Marge Bot
parent 53f9cdac9b
commit 9c909aefc4
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/amd/addrlib/src/gfx11/gfx11addrlib.cpp
View file

@ -1024,6 +1024,17 @@ UINT_32 Gfx11Lib::GetMetaBlkSize(
// For htile surfaces, pad meta block size to 2K * num_pipes
metablkSizeLog2 = Max(metablkSizeLog2, 11 + numPipesLog2);
}
/* This chunk is not part of upstream addrlib. See !28268 */
const INT_32 compFragLog2 = numSamplesLog2;
if (IsRtOptSwizzle(swizzleMode) && (compFragLog2 > 1) && (pipeRotateLog2 >= 1))
{
const INT_32 tmp = 8 + m_pipesLog2 + Max(pipeRotateLog2, compFragLog2 - 1);
metablkSizeLog2 = Max(metablkSizeLog2, tmp);
}
/* End of the non-upstream chunk. */
}
const INT_32 metablkBitsLog2 =