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

iris: Compute aux.possible_usages from aux.usage

Browse source 
We're going to remove res->aux.possible_usages. This will simplify the
commit in which we do so.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14806>
This commit is contained in:
Nanley Chery 2022-01-17 13:34:06 -05:00 • committed by Marge Bot
parent d905018a2c
commit ae763940e8
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/iris/iris_resource.c
View file

@ -772,40 +772,40 @@ iris_resource_configure_aux(struct iris_screen *screen,
assert(!res->mod_info);
assert(!has_hiz);
if (has_ccs) {
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_MCS_CCS;
res->aux.usage = ISL_AUX_USAGE_MCS_CCS;
} else {
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_MCS;
res->aux.usage = ISL_AUX_USAGE_MCS;
}
} else if (has_hiz) {
assert(!res->mod_info);
assert(!has_mcs);
if (!has_ccs) {
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_HIZ;
res->aux.usage = ISL_AUX_USAGE_HIZ;
} else if (res->surf.samples == 1 &&
(res->surf.usage & ISL_SURF_USAGE_TEXTURE_BIT)) {
/* If this resource is single-sampled and will be used as a texture,
* put the HiZ surface in write-through mode so that we can sample
* from it.
*/
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_HIZ_CCS_WT;
res->aux.usage = ISL_AUX_USAGE_HIZ_CCS_WT;
} else {
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_HIZ_CCS;
res->aux.usage = ISL_AUX_USAGE_HIZ_CCS;
}
} else if (has_ccs) {
if (res->mod_info) {
res->aux.possible_usages |= 1 << res->mod_info->aux_usage;
res->aux.usage = res->mod_info->aux_usage;
} else if (isl_surf_usage_is_stencil(res->surf.usage)) {
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_STC_CCS;
res->aux.usage = ISL_AUX_USAGE_STC_CCS;
} else if (want_ccs_e_for_format(devinfo, res->surf.format)) {
res->aux.possible_usages |= devinfo->ver < 12 ?
1 << ISL_AUX_USAGE_CCS_E : 1 << ISL_AUX_USAGE_GFX12_CCS_E;
res->aux.usage = devinfo->ver < 12 ?
ISL_AUX_USAGE_CCS_E : ISL_AUX_USAGE_GFX12_CCS_E;
} else {
assert(isl_format_supports_ccs_d(devinfo, res->surf.format));
res->aux.possible_usages |= 1 << ISL_AUX_USAGE_CCS_D;
res->aux.usage = ISL_AUX_USAGE_CCS_D;
}
}
res->aux.usage = util_last_bit(res->aux.possible_usages) - 1;
res->aux.possible_usages |= 1 << res->aux.usage;
if (!has_hiz || iris_sample_with_depth_aux(devinfo, res))
res->aux.sampler_usages = res->aux.possible_usages;