<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Sep 7, 2018 at 10:39 AM Danylo Piliaiev <<a href="mailto:danylo.piliaiev@gmail.com">danylo.piliaiev@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Comment for array_len field states:<br>
"Indicates the number of array elements starting at<br>
Base Array Layer."<br>
<br>
And most usages of array_len expect it to be equal or less than<br>
total layers - base layer<br>
<br>
v2: Do not subtract base layer if image unit is not layered (Ilia Mirkin)<br>
<br>
Fixes: 5a8c8903<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=107856" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=107856</a><br>
<br>
Signed-off-by: Danylo Piliaiev <<a href="mailto:danylo.piliaiev@globallogic.com" target="_blank">danylo.piliaiev@globallogic.com</a>><br>
---<br>
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 6 ++++--<br>
1 file changed, 4 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c<br>
index 42af41aca3..54f62f0396 100644<br>
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c<br>
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c<br>
@@ -1539,14 +1539,16 @@ update_image_surface(struct brw_context *brw,<br>
} else {<br>
struct intel_texture_object *intel_obj = intel_texture_object(obj);<br>
struct intel_mipmap_tree *mt = intel_obj->mt;<br>
+<br>
+ const unsigned base_layer = obj->MinLayer + u->_Layer;<br>
const unsigned num_layers = u->Layered ?<br>
- get_image_num_layers(mt, obj->Target, u->Level) : 1;<br>
+ (get_image_num_layers(mt, obj->Target, u->Level) - base_layer) : 1;<br>
<br>
struct isl_view view = {<br>
.format = format,<br>
.base_level = obj->MinLevel + u->Level,<br>
.levels = 1,<br>
- .base_array_layer = obj->MinLayer + u->_Layer,<br>
+ .base_array_layer = base_layer,<br>
.array_len = num_layers,<br>
.swizzle = ISL_SWIZZLE_IDENTITY,<br>
.usage = ISL_SURF_USAGE_STORAGE_BIT,<br>
-- <br>
2.18.0<br>
<br>
</blockquote></div>