fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 00:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Fix calculation of layers array length for isl_view

Browse source 
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.piliaiev@globallogic.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Danylo Piliaiev 2018-11-15 12:03:31 +02:00 • committed by Jason Ekstrand
parent 6339aba775
commit f9fd0cf479
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View file

@ -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,