From: Eric Anholt <eric@anholt.net>
Date: Wed, 22 Nov 2017 00:05:49 +0000 (-0800)
Subject: broadcom/vc5: Fix array texture layer count setup.
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=c55813c22e2099d59dbff81b9202b5ce70926e45

broadcom/vc5: Fix array texture layer count setup.

Fixes piglit array-texture.
---

diff --git a/src/gallium/drivers/vc5/vc5_state.c b/src/gallium/drivers/vc5/vc5_state.c
index dc0ee12260b..b7f9c405e4a 100644
--- a/src/gallium/drivers/vc5/vc5_state.c
+++ b/src/gallium/drivers/vc5/vc5_state.c
@@ -623,7 +623,12 @@ vc5_create_sampler_view(struct pipe_context *pctx, struct pipe_resource *prsc,
         v3dx_pack(&so->texture_shader_state, TEXTURE_SHADER_STATE, tex) {
                 tex.image_width = prsc->width0 * msaa_scale;
                 tex.image_height = prsc->height0 * msaa_scale;
-                tex.image_depth = prsc->depth0;
+                if (prsc->target == PIPE_TEXTURE_3D) {
+                        tex.image_depth = prsc->depth0;
+                } else {
+                        tex.image_depth = (cso->u.tex.last_layer -
+                                           cso->u.tex.first_layer) + 1;
+                }
 
                 tex.srgb = util_format_is_srgb(cso->format);