fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/blorp/gen4: Drop cube map flag for single face copy

Browse source 
This will falsely trigger an assert on number of layers once
isl is used for 3D layouts of Gen4 cube maps.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Topi Pohjolainen 2017-07-07 11:33:12 +03:00
parent 91608e4ac1
commit 0926fb69a4
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/intel/blorp/blorp_blit.c
View file

@ -1420,6 +1420,12 @@ blorp_surf_convert_to_single_slice(const struct isl_device *isl_dev,
uint32_t tile_x_px, tile_y_px;
surf_get_intratile_offset_px(info, &tile_x_px, &tile_y_px);
/* Even for cube maps there will be only single face, therefore drop the
* corresponding flag if present.
*/
const isl_surf_usage_flags_t without_cube_map_flag =
info->surf.usage & (~ISL_SURF_USAGE_CUBE_BIT);
struct isl_surf_init_info init_info = {
.dim = ISL_SURF_DIM_2D,
.format = info->surf.format,
@ -1430,7 +1436,7 @@ blorp_surf_convert_to_single_slice(const struct isl_device *isl_dev,
.array_len = 1,
.samples = info->surf.samples,
.row_pitch = info->surf.row_pitch,
.usage = info->surf.usage,
.usage = without_cube_map_flag,
.tiling_flags = 1 << info->surf.tiling,
};