NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

intel/isl: Handle HiZ and CCS tiling more directly

Browse source 
The HiZ and CCS tiling formats are always used for HiZ and CCS surfaces
respectively.  There's no reason why we should go through filter_tiling and
it's much easier to always get HiZ and CCS right if we just handle them
directly.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
This commit is contained in:
Jason Ekstrand 2016-09-01 22:01:47 -07:00
parent b1311a48e0
commit 69d3bb9915
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/intel/isl/isl.c
View file

@ -236,6 +236,22 @@ isl_surf_choose_tiling(const struct isl_device *dev,
{
isl_tiling_flags_t tiling_flags = info->tiling_flags;
/* HiZ surfaces always use the HiZ tiling */
if (info->usage & ISL_SURF_USAGE_HIZ_BIT) {
assert(info->format == ISL_FORMAT_HIZ);
assert(tiling_flags == ISL_TILING_HIZ_BIT);
*tiling = ISL_TILING_HIZ;
return true;
}
/* CCS surfaces always use the CCS tiling */
if (info->usage & ISL_SURF_USAGE_CCS_BIT) {
assert(isl_format_get_layout(info->format)->txc == ISL_TXC_CCS);
assert(tiling_flags == ISL_TILING_CCS_BIT);
*tiling = ISL_TILING_CCS;
return true;
}
if (ISL_DEV_GEN(dev) >= 6) {
gen6_filter_tiling(dev, info, &tiling_flags);
} else {
@ -264,8 +280,6 @@ isl_surf_choose_tiling(const struct isl_device *dev,
CHOOSE(ISL_TILING_LINEAR);
}
CHOOSE(ISL_TILING_CCS);
CHOOSE(ISL_TILING_HIZ);
CHOOSE(ISL_TILING_Ys);
CHOOSE(ISL_TILING_Yf);
CHOOSE(ISL_TILING_Y0);

14
src/intel/isl/isl_gen7.c
View file

@ -217,24 +217,10 @@ gen6_filter_tiling(const struct isl_device *dev,
*flags &= ~ISL_TILING_W_BIT;
}
/* The HiZ format and tiling always go together */
if (info->format == ISL_FORMAT_HIZ) {
*flags &= ISL_TILING_HIZ_BIT;
} else {
*flags &= ~ISL_TILING_HIZ_BIT;
}
/* MCS buffers are always Y-tiled */
if (isl_format_get_layout(info->format)->txc == ISL_TXC_MCS)
*flags &= ISL_TILING_Y0_BIT;
/* The CCS formats and tiling always go together */
if (isl_format_get_layout(info->format)->txc == ISL_TXC_CCS) {
*flags &= ISL_TILING_CCS_BIT;
} else {
*flags &= ~ISL_TILING_CCS_BIT;
}
if (info->usage & (ISL_SURF_USAGE_DISPLAY_ROTATE_90_BIT |
ISL_SURF_USAGE_DISPLAY_ROTATE_180_BIT |
ISL_SURF_USAGE_DISPLAY_ROTATE_270_BIT)) {