freedreno/layout: fix explicit layout offset not added to slice offset
authorJonathan Marek <jonathan@marek.ca>
Sun, 5 Jul 2020 18:38:30 +0000 (14:38 -0400)
committerMarge Bot <eric+marge@anholt.net>
Mon, 6 Jul 2020 11:24:59 +0000 (11:24 +0000)
commit3c5512ce5098eab788158fbb6fc6c04a47727ce7
tree48434dd93336ee6859e245c1ba5bcc4bf97f94c3
parent01986eaf05ca36ddec52c0f7924891c7fc498953
freedreno/layout: fix explicit layout offset not added to slice offset

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: d53dc6c37680eba8e8 ("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>
src/freedreno/fdl/fd6_layout.c