From: Eric Anholt <eric@anholt.net>
Date: Thu, 12 Dec 2019 20:49:12 +0000 (-0800)
Subject: freedreno: Swap the whole resource layout in shadowing.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b586d5a48cc11ee216f18ac093a601917861cff;p=mesa.git

freedreno: Swap the whole resource layout in shadowing.

Let's not have to worry about whether this unusual code path gets
updated whenever we adjust what is in the layout struct.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3059>
---

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 0f48e5878ff..b92663c90a3 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -223,11 +223,7 @@ fd_try_shadow_resource(struct fd_context *ctx, struct fd_resource *rsc,
 	/* TODO valid_buffer_range?? */
 	swap(rsc->bo,        shadow->bo);
 	swap(rsc->write_batch,   shadow->write_batch);
-	for (int level = 0; level <= prsc->last_level; level++) {
-		swap(rsc->layout.slices[level], shadow->layout.slices[level]);
-		swap(rsc->layout.ubwc_slices[level], shadow->layout.ubwc_slices[level]);
-	}
-	swap(rsc->layout.ubwc_layer_size, shadow->layout.ubwc_layer_size);
+	swap(rsc->layout, shadow->layout);
 	rsc->seqno = p_atomic_inc_return(&ctx->screen->rsc_seqno);
 
 	/* at this point, the newly created shadow buffer is not referenced