<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div class="gmail_extra"> <div class="gmail_quote">On Wed, Jul 19, 2017 at 2:29 PM, Kenneth Graunke <<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Wednesday, July 19, 2017 12:53:45 PM PDT Topi Pohjolainen wrote: > CC: <a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a> > CC: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> > Signed-off-by: Topi Pohjolainen <<a href="mailto:topi.pohjolainen@intel.com">topi.pohjolainen@intel.com</a>> > --- > src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > index ab6b9cdd29..bc06949116 100644 > --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > @@ -1632,6 +1632,17 @@ update_buffer_image_param(struct brw_context *brw, > param->stride[0] = _mesa_get_format_bytes(u->_ActualFormat); > } > > +static unsigned > +get_image_num_layers(const struct intel_mipmap_tree *mt, GLenum target, > + unsigned level) > +{ > + if (target == GL_TEXTURE_CUBE_MAP) > + return 6; > + > + return target == GL_TEXTURE_3D ? > + minify(mt->logical_depth0, level) : mt->logical_depth0; > +} > + > static void > update_image_surface(struct brw_context *brw, > struct gl_image_unit *u, > @@ -1660,9 +1671,8 @@ update_image_surface(struct brw_context *brw, > } else { > struct intel_texture_object *intel_obj = intel_texture_object(obj); > struct intel_mipmap_tree *mt = intel_obj->mt; > - const unsigned num_layers = (!u->Layered ? 1 : > - obj->Target == GL_TEXTURE_CUBE_MAP ? 6 : > - mt->logical_depth0); > + const unsigned num_layers = u->Layered ? > + get_image_num_layers(mt, obj->Target, u->Level) : 1; > > struct isl_view view = { > .format = format, > </div></div>Reviewed-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>> _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>