Pushed. On Thu, Nov 15, 2018 at 8:15 PM Jason Ekstrand <ja...@jlekstrand.net> wrote:
> Thanks. I'm going to push it once it gets done running through CI. > > On Thu, Nov 15, 2018 at 4:03 AM Danylo Piliaiev <danylo.pilia...@gmail.com> > wrote: > >> Handle all cases in calculation of layers count for isl_view >> taking into account texture view and image unit. >> st_convert_image was taken as a reference. >> >> When u->Layered is true the whole level is taken with respect to >> image view. In other case only one layer is taken. >> >> v3: (Józef Kucia and Ilia Mirkin) >> - Rewrote patch by taking st_convert_image as a reference >> - Removed now unused get_image_num_layers function >> - Changed commit message >> >> v4: (Jason Ekstrand) >> - Added assert >> >> Fixes: 5a8c8903 >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107856 >> >> Signed-off-by: Danylo Piliaiev <danylo.pilia...@globallogic.com> >> Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> >> --- >> .../drivers/dri/i965/brw_wm_surface_state.c | 33 ++++++++++--------- >> 1 file changed, 18 insertions(+), 15 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 8d21cf5fa7..3286c222e5 100644 >> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c >> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c >> @@ -1499,18 +1499,6 @@ 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->surf.logical_level0_px.depth, level) : >> - mt->surf.logical_level0_px.array_len; >> -} >> - >> static void >> update_image_surface(struct brw_context *brw, >> struct gl_image_unit *u, >> @@ -1541,14 +1529,29 @@ 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 ? >> - get_image_num_layers(mt, obj->Target, u->Level) : 1; >> + >> + unsigned base_layer, num_layers; >> + if (u->Layered) { >> + if (obj->Target == GL_TEXTURE_3D) { >> + base_layer = 0; >> + num_layers = minify(mt->surf.logical_level0_px.depth, >> u->Level); >> + } else { >> + assert(obj->Immutable || obj->MinLayer == 0); >> + base_layer = obj->MinLayer; >> + num_layers = obj->Immutable ? >> + obj->NumLayers : >> + mt->surf.logical_level0_px.array_len; >> + } >> + } else { >> + base_layer = obj->MinLayer + u->_Layer; >> + num_layers = 1; >> + } >> >> struct isl_view view = { >> .format = format, >> .base_level = obj->MinLevel + u->Level, >> .levels = 1, >> - .base_array_layer = obj->MinLayer + u->_Layer, >> + .base_array_layer = base_layer, >> .array_len = num_layers, >> .swizzle = ISL_SWIZZLE_IDENTITY, >> .usage = ISL_SURF_USAGE_STORAGE_BIT, >> -- >> 2.18.0 >> >>
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
