From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 16 Aug 2018 15:12:16 +0000 (-0500)
Subject: isl: Use the view array length for the image size
X-Git-Tag: upstream/19.0.0~2854
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1c414ef2834cfe5f764f5af0ff2ad09d4584351;p=platform%2Fupstream%2Fmesa.git

isl: Use the view array length for the image size

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/intel/isl/isl_storage_image.c b/src/intel/isl/isl_storage_image.c
index e2bd4dd..43398e8 100644
--- a/src/intel/isl/isl_storage_image.c
+++ b/src/intel/isl/isl_storage_image.c
@@ -228,13 +228,16 @@ isl_surf_fill_image_param(const struct isl_device *dev,
 {
    *param = image_param_defaults;
 
+   if (surf->dim != ISL_SURF_DIM_3D) {
+      assert(view->base_array_layer + view->array_len <=
+             surf->logical_level0_px.array_len);
+   }
    param->size[0] = isl_minify(surf->logical_level0_px.w, view->base_level);
    param->size[1] = isl_minify(surf->logical_level0_px.h, view->base_level);
    if (surf->dim == ISL_SURF_DIM_3D) {
       param->size[2] = isl_minify(surf->logical_level0_px.d, view->base_level);
    } else {
-      param->size[2] = surf->logical_level0_px.array_len -
-                       view->base_array_layer;
+      param->size[2] = view->array_len;
    }
 
    isl_surf_get_image_offset_el(surf, view->base_level,