OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno/layout: fix explicit layout offset not added to slice offset

Browse Source 
Accidentally broke this when rebasing the offending commit.

My use case with non-zero explicit offset is UV plane of UBWC NV12, and
only the UBWC slice offset is used for the UBWC sampler, so I didn't catch
it immediately.

Fixes: d53dc6c376 ("freedreno/fdl6: rework layout code a bit (reduce linear align to 64 bytes)")

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5761>
This commit is contained in:
Jonathan Marek
2020-07-05 14:38:30 -04:00
committed by Marge Bot
parent 01986eaf05
commit 3c5512ce50
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedreno/fdl/fd6_layout.c
View File

@@ -218,7 +218,7 @@ fdl6_layout(struct fdl_layout *layout,
if (level == mip_levels - 1)
height = align(nblocksy, 4);
slice->offset = layout->size;
slice->offset = offset + layout->size;
slice->pitch = align(u_minify(pitch0, level), pitchalign);
/* 1d array and 2d array textures must all have the same layer size