Mesa (master): freedreno/layout: fix explicit layout offset not added to slice offset

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3c5512ce5098eab788158fbb6fc6c04a47727ce7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c5512ce5098eab788158fbb6fc6c04a47727ce7

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Sun Jul  5 14:38:30 2020 -0400

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 at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5761>

---

 src/freedreno/fdl/fd6_layout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c
index b5ffde5f8fe..47a6c852da7 100644
--- a/src/freedreno/fdl/fd6_layout.c
+++ b/src/freedreno/fdl/fd6_layout.c
@@ -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