Mesa (master): Revert "intel/isl: Ignore base_array_layer and array_len for 3D storage..."

[Jason Ekstrand]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Sep 13 12:55:25 2016 -0700

Revert "intel/isl: Ignore base_array_layer and array_len for 3D storage..."

This reverts commit 3943888c94beca69e575b8d3d1ec7a6cbf474ee4.  It turns out
that commit was pretty-much bogus since it breaks binding a 3-D texture as a
2-D storage image.  The correct fix for the Vulkan CTS tests needs to be in
the Vulkan driver itself rather than ISL.

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/intel/isl/isl_surface_state.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index f22bf36..1a1a819 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -341,14 +341,10 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
        * Since it's already initialized to 0, we can just leave it alone for
        * texture surfaces.
        */
-      if (info->view->usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) {
+      if (info->view->usage & (ISL_SURF_USAGE_RENDER_TARGET_BIT |
+                               ISL_SURF_USAGE_STORAGE_BIT)) {
          s.MinimumArrayElement = info->view->base_array_layer;
          s.RenderTargetViewExtent = info->view->array_len - 1;
-      } else if (info->view->usage & ISL_SURF_USAGE_STORAGE_BIT) {
-         s.MinimumArrayElement = 0;
-         s.RenderTargetViewExtent =
-            isl_minify(info->surf->logical_level0_px.depth,
-                       info->view->base_level) - 1;
       }
       break;
    default: