From: Jason Ekstrand Date: Wed, 20 Jul 2016 15:22:53 +0000 (-0700) Subject: i965/miptree/isl: Stop multiplying depth by 6 for cubes X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=833e389bc00eae419efe4494c297c6c20a89210b;p=mesa.git i965/miptree/isl: Stop multiplying depth by 6 for cubes Now that the logical_depth0 field is in number of 2D slices, we don't need to be multiplying by 6 when creating the surface. It wasn't hurting anything primarily because we get the actual length from the view which was already handling it correctly. Signed-off-by: Jason Ekstrand Reviewed-by: Anuj Phogat --- diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 1e03f7ef26d..c8e84b71d92 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -3102,11 +3102,6 @@ intel_miptree_get_isl_surf(struct brw_context *brw, if (surf->dim == ISL_SURF_DIM_3D) { surf->logical_level0_px.depth = mt->logical_depth0; surf->logical_level0_px.array_len = 1; - } else if (mt->target == GL_TEXTURE_CUBE_MAP || - mt->target == GL_TEXTURE_CUBE_MAP_ARRAY) { - /* For cube maps, mt->logical_depth0 is in number of cubes */ - surf->logical_level0_px.depth = 1; - surf->logical_level0_px.array_len = mt->logical_depth0 * 6; } else { surf->logical_level0_px.depth = 1; surf->logical_level0_px.array_len = mt->logical_depth0;