From: Rob Clark <robdclark@chromium.org>
Date: Wed, 12 Jun 2019 20:36:18 +0000 (-0700)
Subject: freedreno: turn staging cube into 2d-array
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8be53211d753b362273b8ab90029edee3ba62cd;p=mesa.git

freedreno: turn staging cube into 2d-array

Since we could only need a subset of the layers, and otherwise we
trigger an assert in util_max_layer()

Signed-off-by: Rob Clark <robdclark@chromium.org>
---

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index bcc1efe3cad..7b1b1bf43f8 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -353,6 +353,8 @@ fd_alloc_staging(struct fd_context *ctx, struct fd_resource *rsc,
 	 * for 3d textures, it is the depth:
 	 */
 	if (tmpl.array_size > 1) {
+		if (tmpl.target == PIPE_TEXTURE_CUBE)
+			tmpl.target = PIPE_TEXTURE_2D_ARRAY;
 		tmpl.array_size = box->depth;
 		tmpl.depth0 = 1;
 	} else {